diff --git a/.travis.yml b/.travis.yml
index 5f443be5d3..30a766e40d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: c++
 language: python
 python:
-  - "2.7"
+  - "3.7"
 
 sudo: on
 
@@ -15,7 +15,6 @@ install:
   - sudo pip install sphinx==1.7.9
   - sudo apt-get install texlive-full yarn
   - git clone https://github.com/tabatkins/bikeshed.git
-  - git -C $PWD/bikeshed checkout 087ea90e1ebd0321c20373d89950d1c6b73d5df1
   - pip install --editable $PWD/bikeshed
   - bikeshed update
 
diff --git a/document/core/util/bikeshed_fixup.py b/document/core/util/bikeshed_fixup.py
index 181d3b6734..3a44afaf5b 100755
--- a/document/core/util/bikeshed_fixup.py
+++ b/document/core/util/bikeshed_fixup.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 # -*- coding: latin-1 -*-
 
 import os
diff --git a/document/core/util/mathjax2katex.py b/document/core/util/mathjax2katex.py
index b42fe3e1a7..654f62e147 100755
--- a/document/core/util/mathjax2katex.py
+++ b/document/core/util/mathjax2katex.py
@@ -1,7 +1,7 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 # -*- coding: latin-1 -*-
 
-import Queue
+import queue
 import os
 import re
 import shelve
@@ -239,7 +239,7 @@ def Worker():
       q.task_done()
       sys.stderr.write('.')
 
-  q = Queue.Queue()
+  q = queue.Queue()
   for i in range(40):
     t = threading.Thread(target=Worker)
     t.daemon = True
diff --git a/test/core/run.py b/test/core/run.py
index 7518955417..ec07929c4a 100755
--- a/test/core/run.py
+++ b/test/core/run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import argparse