diff --git a/gajim/common/file_props.py b/gajim/common/file_props.py
index a5d7a5fb6..4a7788885 100644
--- a/gajim/common/file_props.py
+++ b/gajim/common/file_props.py
@@ -3,13 +3,13 @@ This module is in charge of taking care of all the infomation related to
 individual files. Files are identified by the account name and its sid.
 
 
->>> print FilesProp.getFileProp('jabberid', '10')
+>>> print(FilesProp.getFileProp('jabberid', '10'))
 None
 >>> fp = FilesProp()
 Traceback (most recent call last):
     ...
 Exception: this class should not be instatiated
->>> print FilesProp.getAllFileProp()
+>>> print(FilesProp.getAllFileProp())
 []
 >>> fp = FilesProp.getNewFileProp('jabberid', '10')
 >>> fp2 = FilesProp.getFileProp('jabberid', '10')
diff --git a/gajim/common/rst_xhtml_generator.py b/gajim/common/rst_xhtml_generator.py
index 247c0f6f3..058fa61db 100644
--- a/gajim/common/rst_xhtml_generator.py
+++ b/gajim/common/rst_xhtml_generator.py
@@ -153,7 +153,7 @@ if __name__ == '__main__':
     print("test 1\n" + Generator.create_xhtml("""
 test::
 
->>> print 1
+>>> print(1)
 1
 
 *I* like it. It is for :JEP:`71`
diff --git a/scripts/dev/run-build-test.py b/scripts/dev/run-build-test.py
deleted file mode 100755
index c8b3b355f..000000000
--- a/scripts/dev/run-build-test.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-
-if os.getcwd().endswith('dev'):
-    os.chdir('../../') # we were in scripts/dev
-
-ret = 0
-ret += os.system("make clean > " + os.devnull)
-ret += os.system("make > " + os.devnull)
-ret += os.system("make check > " + os.devnull)
-
-if ret == 0:
-    print "Build successfull"
-    sys.exit(0)
-else:
-    print >>sys.stderr, "Build failed"
-    sys.exit(1)
diff --git a/scripts/dev/run-pylint.py b/scripts/dev/run-pylint.py
index 1d4113973..53db98f36 100755
--- a/scripts/dev/run-pylint.py
+++ b/scripts/dev/run-pylint.py
@@ -1,5 +1,6 @@
-#!/usr/bin/env python
-# (C) 2006 Nikos Kouremenos <kourem@gmail.com>
+#!/usr/bin/env python3
+# Copyright (C) 2006 Nikos Kouremenos <kourem@gmail.com>
+# Copyright (C) 2016 Yann Leboulanger <asterix AT lagaule.org>
 
 import os
 import sys
@@ -7,4 +8,4 @@ import sys
 if os.getcwd().endswith('dev'):
     os.chdir('../../gajim/') # we were in scripts/dev
 
-os.system("pylint --include-ids=y --additional-builtins='_' --disable-msg=C0103,C0111,W0703,W0511,W0142,W0613,R0201 --disable-checker=design " + "".join(sys.argv[1:]))
+os.system("pylint3 --generated-members= --additional-builtins='_' --disable=C0103,C0111,W0703,W0511,W0142,W0613,R0201,design " + "".join(sys.argv[1:]))