diff --git a/test/crossrunner/compat.py b/test/crossrunner/compat.py
index 932a48c..a670c33 100644
--- a/test/crossrunner/compat.py
+++ b/test/crossrunner/compat.py
@@ -1,24 +1,7 @@
 import os
-import sys
 
-if sys.version_info[0] == 2:
-    _ENCODE = sys.getfilesystemencoding()
+path_join = os.path.join
+str_join = str.join
 
-    def path_join(*args):
-        bin_args = map(lambda a: a.decode(_ENCODE), args)
-        return os.path.join(*bin_args).encode(_ENCODE)
-
-    def str_join(left, right):
-        bin_args = map(lambda a: a.decode(_ENCODE), right)
-        b = left.decode(_ENCODE)
-        return b.join(bin_args).encode(_ENCODE)
-
-    logfile_open = open
-
-else:
-
-    path_join = os.path.join
-    str_join = str.join
-
-    def logfile_open(*args):
-        return open(*args, errors='replace')
+def logfile_open(*args):
+    return open(*args, errors='replace')
diff --git a/test/crossrunner/report.py b/test/crossrunner/report.py
index 5baf161..7e1b0c7 100644
--- a/test/crossrunner/report.py
+++ b/test/crossrunner/report.py
@@ -17,7 +17,6 @@
 # under the License.
 #
 
-from __future__ import print_function
 import datetime
 import json
 import multiprocessing
@@ -317,10 +316,7 @@
             self._print_bar()
 
     def _http_server_command(self, port):
-        if sys.version_info[0] < 3:
-            return 'python -m SimpleHTTPServer %d' % port
-        else:
-            return 'python -m http.server %d' % port
+        return 'python -m http.server %d' % port
 
     def _print_footer(self):
         fail_count = len(self._expected_failure) + len(self._unexpected_failure)