diff --git a/fill3_test.py b/fill3_test.py
index 7c1ea55..1a02041 100755
--- a/fill3_test.py
+++ b/fill3_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2015-2017 Andrew Hamilton. All rights reserved.
diff --git a/gut.py b/gut.py
index 090666e..fd68fcc 100755
--- a/gut.py
+++ b/gut.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 # Copyright (C) 2015-2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.
diff --git a/gut_test.py b/gut_test.py
index 7d87804..1a8b93b 100755
--- a/gut_test.py
+++ b/gut_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 # Copyright (C) 2015-2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.
diff --git a/install-dependencies b/install-dependencies
index 9823247..55e85ea 100755
--- a/install-dependencies
+++ b/install-dependencies
@@ -5,7 +5,7 @@ set -e
 
 
 echo "Install the dependencies of the vigil script..."
-sudo apt-get --yes install python3-minimal python3-pygments python3-pyinotify \
+sudo apt-get --yes install python3.5 python3-minimal python3-pygments python3-pyinotify \
      python3-docopt util-linux
 echo
 echo "Install all the tools vigil may need..."
diff --git a/install-tools b/install-tools
index d7effba..6d3365b 100755
--- a/install-tools
+++ b/install-tools
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 
 import subprocess
diff --git a/lscolors_test.py b/lscolors_test.py
index e806e15..8329afd 100755
--- a/lscolors_test.py
+++ b/lscolors_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 # Copyright (C) 2011, 2015-2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.
diff --git a/make-readme.py b/make-readme.py
index 2092816..54b1f39 100755
--- a/make-readme.py
+++ b/make-readme.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2017 Andrew Hamilton. All rights reserved.
diff --git a/sandbox_fs.py b/sandbox_fs.py
index e83f396..77878c3 100755
--- a/sandbox_fs.py
+++ b/sandbox_fs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 # Copyright (C) 2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.
diff --git a/sandbox_fs_test.py b/sandbox_fs_test.py
index 89725af..f8f347c 100755
--- a/sandbox_fs_test.py
+++ b/sandbox_fs_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 # Copyright (C) 2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.
diff --git a/termstr_test.py b/termstr_test.py
index e1d7a9b..ee6b824 100755
--- a/termstr_test.py
+++ b/termstr_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 # Copyright (C) 2015-2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.
diff --git a/tools_test.py b/tools_test.py
index 0c1cf84..1068bd4 100755
--- a/tools_test.py
+++ b/tools_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 # Copyright (C) 2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.
diff --git a/urwid/__init__.py b/urwid/__init__.py
index 80aa202..b9ae2a3 100644
--- a/urwid/__init__.py
+++ b/urwid/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
 #
 # Urwid __init__.py - all the stuff you're likely to care about
 #
diff --git a/urwid/escape.py b/urwid/escape.py
index 6e73051..be36106 100644
--- a/urwid/escape.py
+++ b/urwid/escape.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
 # Urwid escape sequences common to curses_display and raw_display
diff --git a/urwid/raw_display.py b/urwid/raw_display.py
index 1f21c0e..afb76b2 100644
--- a/urwid/raw_display.py
+++ b/urwid/raw_display.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
 #
 # Urwid raw display module
 #    Copyright (C) 2004-2009  Ian Ward
@@ -331,11 +330,3 @@ class Screen:
 
     def _getch_nodelay(self):
         return self._getch(0)
-
-
-def _test():
-    import doctest
-    doctest.testmod()
-
-if __name__=='__main__':
-    _test()
diff --git a/vigil b/vigil
index 6db8d37..96a0433 100755
--- a/vigil
+++ b/vigil
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2015-2017 Andrew Hamilton. All rights reserved.
diff --git a/vigil_test.py b/vigil_test.py
index d71a398..dbaf270 100755
--- a/vigil_test.py
+++ b/vigil_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 # Copyright (C) 2015-2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.
diff --git a/worker.py b/worker.py
index 9182cef..0c33ecb 100755
--- a/worker.py
+++ b/worker.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 # Copyright (C) 2015-2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.
diff --git a/worker_test.py b/worker_test.py
index 4fe5102..a2760a1 100755
--- a/worker_test.py
+++ b/worker_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 # Copyright (C) 2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.