diff --git a/.travis.yml b/.travis.yml
index 7ef099369be..7b38f896d42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -175,15 +175,15 @@ matrix:
 
     - <<: *default_test_config
       env:
-        - SHARD="Python contrib tests - shard 1"
+        - SHARD="Py2 - Python contrib tests"
       script:
-        - ./build-support/bin/ci.sh -n -y 0/2 "${SHARD}"
+        - ./build-support/bin/ci.sh -n "${SHARD}"
 
     - <<: *default_test_config
       env:
-        - SHARD="Python contrib tests - shard 2"
+        - SHARD="Py3 - Python contrib tests"
       script:
-        - ./build-support/bin/ci.sh -n -y 1/2 "${SHARD}"
+        - ./build-support/bin/ci.sh -3n "${SHARD}"
 
     - <<: *default_test_config
       env:
diff --git a/contrib/go/src/python/pants/contrib/go/tasks/go_task.py b/contrib/go/src/python/pants/contrib/go/tasks/go_task.py
index cd55cb09eed..2c793d64a5f 100644
--- a/contrib/go/src/python/pants/contrib/go/tasks/go_task.py
+++ b/contrib/go/src/python/pants/contrib/go/tasks/go_task.py
@@ -93,7 +93,7 @@ def go_stdlib(self):
     :rtype: frozenset of string
     """
     out = self._go_dist.create_go_cmd('list', args=['std']).check_output()
-    return frozenset(out.strip().split())
+    return frozenset(out.decode('utf-8').strip().split())
 
   # This simple regex mirrors the behavior of the relevant go code in practice (see
   # repoRootForImportDynamic and surrounding code in
@@ -154,7 +154,7 @@ def list_imports(self, pkg, gopath=None):
       if returncode != 0:
         raise self.ListDepsError('Problem listing imports for {}: {} failed with exit code {}'
                                  .format(pkg, go_cmd, returncode))
-      data = json.loads(out)
+      data = json.loads(out.decode('utf-8'))
 
       # XTestImports are for black box tests.  These test files live inside the package dir but
       # declare a different package and thus can only access the public members of the package's
diff --git a/contrib/go/tests/python/pants_test/contrib/go/subsystems/test_go_distribution.py b/contrib/go/tests/python/pants_test/contrib/go/subsystems/test_go_distribution.py
index 33055c0452f..4486df054c5 100644
--- a/contrib/go/tests/python/pants_test/contrib/go/subsystems/test_go_distribution.py
+++ b/contrib/go/tests/python/pants_test/contrib/go/subsystems/test_go_distribution.py
@@ -17,6 +17,14 @@
 
 class GoDistributionTest(unittest.TestCase):
 
+  @staticmethod
+  def _generate_go_command_regex(gopath, final_value):
+    goroot_env = r'GOROOT=[^ ]+'
+    gopath_env = r'GOPATH={}'.format(gopath)
+    # order of env values varies by interpreter and platform
+    env_values = r'({goroot_env} {gopath_env}|{gopath_env} {goroot_env})'.format(goroot_env=goroot_env, gopath_env=gopath_env)
+    return r'^{env_values} .*/go env {final_value}$'.format(env_values=env_values, final_value=final_value)
+
   def distribution(self):
     return global_subsystem_instance(GoDistribution)
 
@@ -46,10 +54,11 @@ def assert_no_gopath(self):
     self.assertEqual(go_env, go_cmd.env)
     self.assertEqual('go', os.path.basename(go_cmd.cmdline[0]))
     self.assertEqual(['env', 'GOPATH'], go_cmd.cmdline[1:])
-    self.assertRegexpMatches(str(go_cmd),
-                             r'^GOROOT=[^ ]+ GOPATH={} .*/go env GOPATH'.format(default_gopath))
     self.assertEqual(default_gopath, go_cmd.check_output().decode('utf-8').strip())
 
+    regex = GoDistributionTest._generate_go_command_regex(gopath=default_gopath, final_value='GOPATH')
+    self.assertRegexpMatches(str(go_cmd), regex)
+
   def test_go_command_no_gopath(self):
     self.assert_no_gopath()
 
@@ -68,4 +77,6 @@ def test_go_command_gopath(self):
                       'GOPATH': '/tmp/fred'}, go_cmd.env)
     self.assertEqual('go', os.path.basename(go_cmd.cmdline[0]))
     self.assertEqual(['env', 'GOROOT'], go_cmd.cmdline[1:])
-    self.assertRegexpMatches(str(go_cmd), r'^GOROOT=[^ ]+ GOPATH=/tmp/fred .*/go env GOROOT$')
+
+    regex = GoDistributionTest._generate_go_command_regex(gopath='/tmp/fred', final_value='GOROOT')
+    self.assertRegexpMatches(str(go_cmd), regex)
diff --git a/contrib/go/tests/python/pants_test/contrib/go/tasks/test_go_compile_integration.py b/contrib/go/tests/python/pants_test/contrib/go/tasks/test_go_compile_integration.py
index 8090856b533..0e75c6cb3a8 100644
--- a/contrib/go/tests/python/pants_test/contrib/go/tasks/test_go_compile_integration.py
+++ b/contrib/go/tests/python/pants_test/contrib/go/tasks/test_go_compile_integration.py
@@ -22,8 +22,8 @@ def test_go_compile_simple(self):
       pants_run = self.run_pants_with_workdir(args, workdir)
       self.assert_success(pants_run)
       go_dist = global_subsystem_instance(GoDistribution)
-      goos = go_dist.create_go_cmd('env', args=['GOOS']).check_output().strip()
-      goarch = go_dist.create_go_cmd('env', args=['GOARCH']).check_output().strip()
+      goos = go_dist.create_go_cmd('env', args=['GOOS']).check_output().decode('utf-8').strip()
+      goarch = go_dist.create_go_cmd('env', args=['GOARCH']).check_output().decode('utf-8').strip()
       expected_files = set('contrib.go.examples.src.go.{libname}.{libname}/'
                            'pkg/{goos}_{goarch}/{libname}.a'
                            .format(libname=libname, goos=goos, goarch=goarch)
diff --git a/contrib/go/tests/python/pants_test/contrib/go/tasks/test_go_fetch.py b/contrib/go/tests/python/pants_test/contrib/go/tasks/test_go_fetch.py
index 6da0f6dfc32..23e915d431f 100644
--- a/contrib/go/tests/python/pants_test/contrib/go/tasks/test_go_fetch.py
+++ b/contrib/go/tests/python/pants_test/contrib/go/tasks/test_go_fetch.py
@@ -41,7 +41,7 @@ def test_get_remote_import_paths(self):
     """)
     remote_import_ids = go_fetch._get_remote_import_paths('github.com/u/a',
                                                           gopath=self.build_root)
-    self.assertItemsEqual(remote_import_ids, ['bitbucket.org/u/b', 'github.com/u/c'])
+    self.assertEqual(sorted(remote_import_ids), sorted(['bitbucket.org/u/b', 'github.com/u/c']))
 
   def test_resolve_and_inject_explicit(self):
     r1 = self.make_target(spec='3rdparty/go/r1', target_type=GoRemoteLibrary)
@@ -219,4 +219,4 @@ def test_issues_2616(self):
     """)
     remote_import_ids = go_fetch._get_remote_import_paths('github.com/u/a',
                                                           gopath=self.build_root)
-    self.assertItemsEqual(remote_import_ids, ['bitbucket.org/u/b', 'github.com/u/c'])
+    self.assertEqual(sorted(remote_import_ids), sorted(['bitbucket.org/u/b', 'github.com/u/c']))
diff --git a/contrib/googlejavaformat/tests/python/pants_test/contrib/googlejavaformat/test_googlejavaformat.py b/contrib/googlejavaformat/tests/python/pants_test/contrib/googlejavaformat/test_googlejavaformat.py
index c00d5e78047..e35a7292a2a 100644
--- a/contrib/googlejavaformat/tests/python/pants_test/contrib/googlejavaformat/test_googlejavaformat.py
+++ b/contrib/googlejavaformat/tests/python/pants_test/contrib/googlejavaformat/test_googlejavaformat.py
@@ -86,7 +86,7 @@ def test_lint_badformat(self):
     with self.assertRaises(TaskError) as error:
       self.execute(context)
     self.assertEqual(
-      error.exception.message,
+      str(error.exception),
       'google-java-format failed with exit code 1; to fix run: `./pants fmt <targets>`'
     )
 
diff --git a/contrib/node/src/python/pants/contrib/node/subsystems/command.py b/contrib/node/src/python/pants/contrib/node/subsystems/command.py
index 44321935b0c..8e4ef558a64 100644
--- a/contrib/node/src/python/pants/contrib/node/subsystems/command.py
+++ b/contrib/node/src/python/pants/contrib/node/subsystems/command.py
@@ -63,7 +63,7 @@ def check_output(self, **kwargs):
     :raises: :class:`subprocess.CalledProcessError` if the command fails.
     """
     env, kwargs = self._prepare_env(kwargs)
-    return subprocess.check_output(self.cmd, env=env, **kwargs)
+    return subprocess.check_output(self.cmd, env=env, **kwargs).decode('utf-8')
 
   def __str__(self):
     return ' '.join(self.cmd)
diff --git a/contrib/node/tests/python/pants_test/contrib/node/subsystems/test_node_distribution.py b/contrib/node/tests/python/pants_test/contrib/node/subsystems/test_node_distribution.py
index fa22c88431c..1873abdb32f 100644
--- a/contrib/node/tests/python/pants_test/contrib/node/subsystems/test_node_distribution.py
+++ b/contrib/node/tests/python/pants_test/contrib/node/subsystems/test_node_distribution.py
@@ -21,7 +21,7 @@ def setUp(self):
 
   def test_bootstrap(self):
     node_cmd = self.distribution.node_command(args=['--version'])
-    output = node_cmd.check_output().decode('utf-8').strip()
+    output = node_cmd.check_output().strip()
     self.assertEqual(self.distribution.version(), output)
 
   def test_node(self):
@@ -42,7 +42,7 @@ def test_node(self):
   def test_npm(self):
     npm_version_flag = self.distribution.get_package_manager('npm').run_command(
       args=['--version'])
-    raw_version = npm_version_flag.check_output().decode('utf-8').strip()
+    raw_version = npm_version_flag.check_output().strip()
 
     npm_version_cmd = self.distribution.get_package_manager('npm').run_command(
       args=['version', '--json'])
@@ -54,7 +54,7 @@ def test_npm(self):
   def test_yarnpkg(self):
     yarnpkg_version_command = self.distribution.get_package_manager('yarn').run_command(
       args=['--version'])
-    yarnpkg_version = yarnpkg_version_command.check_output().decode('utf-8').strip()
+    yarnpkg_version = yarnpkg_version_command.check_output().strip()
     yarnpkg_versions_command = self.distribution.get_package_manager('yarn').run_command(
       args=['versions', '--json'])
     yarnpkg_versions = json.loads(yarnpkg_versions_command.check_output())
@@ -67,7 +67,7 @@ def test_node_command_path_injection(self):
 
     # Test the case in which we do not pass in env,
     # which should fall back to env=os.environ.copy()
-    injected_paths = node_path_cmd.check_output().decode('utf-8').strip().split(os.pathsep)
+    injected_paths = node_path_cmd.check_output().strip().split(os.pathsep)
     self.assertEqual(node_bin_path, injected_paths[0])
 
   def test_node_command_path_injection_with_overrided_path(self):
@@ -76,7 +76,7 @@ def test_node_command_path_injection_with_overrided_path(self):
     node_bin_path = self.distribution._install_node()
     injected_paths = node_path_cmd.check_output(
       env={'PATH': '/test/path'}
-    ).decode('utf-8').strip().split(os.pathsep)
+    ).strip().split(os.pathsep)
     self.assertEqual(node_bin_path, injected_paths[0])
     self.assertListEqual([node_bin_path, '/test/path'], injected_paths)
 
@@ -86,5 +86,5 @@ def test_node_command_path_injection_with_empty_path(self):
     node_bin_path = self.distribution._install_node()
     injected_paths = node_path_cmd.check_output(
       env={'PATH': ''}
-    ).decode('utf-8').strip().split(os.pathsep)
+    ).strip().split(os.pathsep)
     self.assertListEqual([node_bin_path, ''], injected_paths)
diff --git a/contrib/python/src/python/pants/contrib/python/checks/tasks/python_eval.py b/contrib/python/src/python/pants/contrib/python/checks/tasks/python_eval.py
index 898981bd469..393df7ae79e 100644
--- a/contrib/python/src/python/pants/contrib/python/checks/tasks/python_eval.py
+++ b/contrib/python/src/python/pants/contrib/python/checks/tasks/python_eval.py
@@ -34,8 +34,8 @@ class Error(TaskError):
     """A richer failure exception type useful for tests."""
 
     def __init__(self, *args, **kwargs):
-      compiled = kwargs.pop(b'compiled')
-      failed = kwargs.pop(b'failed')
+      compiled = kwargs.pop('compiled')
+      failed = kwargs.pop('failed')
       super(PythonEval.Error, self).__init__(*args, **kwargs)
       self.compiled = compiled
       self.failed = failed
@@ -139,9 +139,9 @@ def _compile_target(self, vt):
       executable_file_content = self._get_executable_file_content(exec_pex_parent, modules)
 
       hasher = hashlib.sha1()
-      hasher.update(reqs_pex.path())
-      hasher.update(srcs_pex.path())
-      hasher.update(executable_file_content)
+      hasher.update(reqs_pex.path().encode('utf-8'))
+      hasher.update(srcs_pex.path().encode('utf-8'))
+      hasher.update(executable_file_content.encode('utf-8'))
       exec_file_hash = hasher.hexdigest()
       exec_pex_path = os.path.realpath(os.path.join(exec_pex_parent, exec_file_hash))
       if not os.path.isdir(exec_pex_path):
@@ -215,7 +215,7 @@ def _resolve_requirements_for_versioned_target_closure(self, interpreter, vt):
     reqs_pex_path = os.path.realpath(os.path.join(self.workdir, str(interpreter.identity),
                                                   vt.cache_key.hash))
     if not os.path.isdir(reqs_pex_path):
-      req_libs =  [t for t in vt.target.closure() if has_python_requirements(t)]
+      req_libs = [t for t in vt.target.closure() if has_python_requirements(t)]
       with safe_concurrent_creation(reqs_pex_path) as safe_path:
         builder = PEXBuilder(safe_path, interpreter=interpreter, copy=True)
         dump_requirement_libs(builder, interpreter, req_libs, self.context.log)
diff --git a/contrib/python/tests/python/pants_test/contrib/python/checks/tasks/checkstyle/test_checker.py b/contrib/python/tests/python/pants_test/contrib/python/checks/tasks/checkstyle/test_checker.py
index 2c1172212ea..32bdf77d600 100644
--- a/contrib/python/tests/python/pants_test/contrib/python/checks/tasks/checkstyle/test_checker.py
+++ b/contrib/python/tests/python/pants_test/contrib/python/checks/tasks/checkstyle/test_checker.py
@@ -12,8 +12,8 @@
 from pants_test.backend.python.tasks.python_task_test_base import PythonTaskTestBase
 
 from pants.contrib.python.checks.tasks.checkstyle.checker import PythonCheckStyleTask
-from pants.contrib.python.checks.tasks.checkstyle.print_statements_subsystem import \
-  PrintStatementsSubsystem
+from pants.contrib.python.checks.tasks.checkstyle.variable_names_subsystem import \
+  VariableNamesSubsystem
 
 
 class PythonCheckStyleTaskTest(PythonTaskTestBase):
@@ -24,7 +24,7 @@ def task_type(cls):
   def setUp(self):
     super(PythonCheckStyleTaskTest, self).setUp()
     PythonCheckStyleTask.clear_plugins()
-    PythonCheckStyleTask.register_plugin('print-statements', PrintStatementsSubsystem)
+    PythonCheckStyleTask.register_plugin('variable-names', VariableNamesSubsystem)
 
   def tearDown(self):
     super(PythonCheckStyleTaskTest, self).tearDown()
@@ -36,7 +36,8 @@ def test_no_sources(self):
 
   def test_pass(self):
     self.create_file('a/python/pass.py', contents=dedent("""
-                       print('Print is a function')
+                       class UpperCase: 
+                         pass
                      """))
     target = self.make_target('a/python:pass', PythonLibrary, sources=['pass.py'])
     context = self.context(target_roots=[target])
@@ -45,7 +46,8 @@ def test_pass(self):
 
   def test_failure(self):
     self.create_file('a/python/fail.py', contents=dedent("""
-                         print 'Print should not be used as a statement'
+                        class lower_case:
+                          pass
                        """))
     target = self.make_target('a/python:fail', PythonLibrary, sources=['fail.py'])
     context = self.context(target_roots=[target])
@@ -56,20 +58,21 @@ def test_failure(self):
 
   def test_suppressed_file_passes(self):
     self.create_file('a/python/fail.py', contents=dedent("""
-                         print 'Print should not be used as a statement'
+                        class lower_case:
+                          pass
                        """))
     suppression_file = self.create_file('suppress.txt', contents=dedent("""
-    a/python/fail\.py::print-statements"""))
+    a/python/fail\.py::variable-names"""))
     target = self.make_target('a/python:fail', PythonLibrary, sources=['fail.py'])
     self.set_options(suppress=suppression_file)
     context = self.context(target_roots=[target], )
     task = self.create_task(context)
-
     self.assertEqual(0, task.execute())
 
   def test_failure_fail_false(self):
     self.create_file('a/python/fail.py', contents=dedent("""
-                       print 'Print should not be used as a statement'
+                        class lower_case:
+                          pass
                      """))
     target = self.make_target('a/python:fail', PythonLibrary, sources=['fail.py'])
     self.set_options(fail=False)
@@ -90,7 +93,8 @@ def test_syntax_error(self):
 
   def test_failure_print_nit(self):
     self.create_file('a/python/fail.py', contents=dedent("""
-                         print 'Print should not be used as a statement'
+                        class lower_case:
+                          pass
                        """))
     target = self.make_target('a/python:fail', PythonLibrary, sources=['fail.py'])
     context = self.context(target_roots=[target])
@@ -100,8 +104,8 @@ def test_failure_print_nit(self):
 
     self.assertEqual(1, len(nits))
     self.assertEqual(
-      """T607:ERROR   a/python/fail.py:002 Print used as a statement.\n"""
-      """     |print 'Print should not be used as a statement'""",
+      """T000:ERROR   a/python/fail.py:002 Classes must be UpperCamelCased\n"""
+      """     |class lower_case:""",
       str(nits[0]))
 
   def test_syntax_error_nit(self):
@@ -121,21 +125,3 @@ def test_syntax_error_nit(self):
                      """     |invalid python\n"""
                      """     |""",
                      str(nits[0]))
-
-  def test_multiline_nit_printed_only_once(self):
-    self.create_file('a/python/fail.py', contents=dedent("""
-                         print ('Multi'
-                                'line') + 'expression'
-                       """))
-    target = self.make_target('a/python:fail', PythonLibrary, sources=['fail.py'])
-    context = self.context(target_roots=[target])
-    task = self.create_task(context)
-
-    nits = list(task.get_nits('a/python/fail.py'))
-
-    self.assertEqual(1, len(nits))
-    self.assertEqual(
-      """T607:ERROR   a/python/fail.py:002-003 Print used as a statement.\n"""
-      """     |print ('Multi'\n"""
-      """     |       'line') + 'expression'""",
-      str(nits[0]))
diff --git a/contrib/python/tests/python/pants_test/contrib/python/checks/tasks/test_python_eval.py b/contrib/python/tests/python/pants_test/contrib/python/checks/tasks/test_python_eval.py
index a6dc6f9eebe..3df47257c1d 100644
--- a/contrib/python/tests/python/pants_test/contrib/python/checks/tasks/test_python_eval.py
+++ b/contrib/python/tests/python/pants_test/contrib/python/checks/tasks/test_python_eval.py
@@ -6,6 +6,8 @@
 
 from textwrap import dedent
 
+import pytest
+from future.utils import PY3
 from pants.backend.python.subsystems.python_repos import PythonRepos
 from pants.backend.python.subsystems.python_setup import PythonSetup
 from pants_test.backend.python.tasks.python_task_test_base import PythonTaskTestBase
@@ -13,6 +15,8 @@
 from pants.contrib.python.checks.tasks.python_eval import PythonEval
 
 
+# TODO(python3port): https://github.com/pantsbuild/pants/issues/6354. Fix before switching fully to Py3.
+@pytest.mark.skipif(PY3, reason='PEX issue when using Python 3. https://github.com/pantsbuild/pants/issues/6354')
 class PythonEvalTest(PythonTaskTestBase):
 
   @classmethod
diff --git a/contrib/scrooge/src/python/pants/contrib/scrooge/tasks/java_thrift_library_fingerprint_strategy.py b/contrib/scrooge/src/python/pants/contrib/scrooge/tasks/java_thrift_library_fingerprint_strategy.py
index 30f7273ee54..de5c5ff3f61 100644
--- a/contrib/scrooge/src/python/pants/contrib/scrooge/tasks/java_thrift_library_fingerprint_strategy.py
+++ b/contrib/scrooge/src/python/pants/contrib/scrooge/tasks/java_thrift_library_fingerprint_strategy.py
@@ -29,8 +29,8 @@ def compute_fingerprint(self, target):
       return fp
 
     hasher = hashlib.sha1()
-    hasher.update(fp)
-    hasher.update(self._thrift_defaults.language(target))
+    hasher.update(fp.encode('utf-8'))
+    hasher.update(self._thrift_defaults.language(target).encode('utf-8'))
     hasher.update(str(self._thrift_defaults.compiler_args(target)).encode('utf-8'))
 
     namespace_map = self._thrift_defaults.namespace_map(target)
diff --git a/contrib/scrooge/tests/python/pants_test/contrib/scrooge/tasks/test_thrift_linter.py b/contrib/scrooge/tests/python/pants_test/contrib/scrooge/tasks/test_thrift_linter.py
index f8db447e695..3611202b1ed 100644
--- a/contrib/scrooge/tests/python/pants_test/contrib/scrooge/tasks/test_thrift_linter.py
+++ b/contrib/scrooge/tests/python/pants_test/contrib/scrooge/tasks/test_thrift_linter.py
@@ -40,8 +40,8 @@ def get_default_jvm_options():
     thrift_target = self.create_library('a', 'java_thrift_library', 'a', ['A.thrift'])
     task = self.create_task(self.context(target_roots=thrift_target))
     self._prepare_mocks(task)
-    expected_include_paths = {'src/thrift/tweet', 'src/thrift/users'}
-    expected_paths = {'src/thrift/tweet/a.thrift', 'src/thrift/tweet/b.thrift'}
+    expected_include_paths = ['src/thrift/users', 'src/thrift/tweet']
+    expected_paths = ['src/thrift/tweet/a.thrift', 'src/thrift/tweet/b.thrift']
     mock_calculate_compile_sources.return_value = (expected_include_paths, expected_paths)
     task._lint(thrift_target, task.tool_classpath('scrooge-linter'))
 
@@ -49,6 +49,6 @@ def get_default_jvm_options():
       classpath='foo_classpath',
       main='com.twitter.scrooge.linter.Main',
       args=['--ignore-errors', '--include-path', 'src/thrift/users', '--include-path',
-            'src/thrift/tweet', 'src/thrift/tweet/b.thrift', 'src/thrift/tweet/a.thrift'],
+            'src/thrift/tweet', 'src/thrift/tweet/a.thrift', 'src/thrift/tweet/b.thrift'],
       jvm_options=get_default_jvm_options(),
       workunit_labels=[WorkUnitLabel.COMPILER, WorkUnitLabel.SUPPRESS_LABEL])
diff --git a/pants-plugins/tests/python/internal_backend_test/sitegen/test_sitegen.py b/pants-plugins/tests/python/internal_backend_test/sitegen/test_sitegen.py
index 649bab2e0e4..90708aaaf78 100644
--- a/pants-plugins/tests/python/internal_backend_test/sitegen/test_sitegen.py
+++ b/pants-plugins/tests/python/internal_backend_test/sitegen/test_sitegen.py
@@ -95,10 +95,10 @@ class AllTheThingsTestCase(unittest.TestCase):
   def setUp(self):
     self.config = json.loads(CONFIG_JSON)
     self.soups = {
-      'index': bs4.BeautifulSoup(INDEX_HTML),
-      'subdir/page1': bs4.BeautifulSoup(P1_HTML),
-      'subdir/page2': bs4.BeautifulSoup(P2_HTML),
-      'subdir/page2_no_toc': bs4.BeautifulSoup(P2_HTML),
+      'index': bs4.BeautifulSoup(INDEX_HTML, 'html.parser'),
+      'subdir/page1': bs4.BeautifulSoup(P1_HTML, 'html.parser'),
+      'subdir/page2': bs4.BeautifulSoup(P2_HTML, 'html.parser'),
+      'subdir/page2_no_toc': bs4.BeautifulSoup(P2_HTML, 'html.parser'),
     }
     self.precomputed = sitegen.precompute(self.config, self.soups)
 
diff --git a/src/python/pants/backend/jvm/ivy_utils.py b/src/python/pants/backend/jvm/ivy_utils.py
index c3b40da12ae..854997c421e 100644
--- a/src/python/pants/backend/jvm/ivy_utils.py
+++ b/src/python/pants/backend/jvm/ivy_utils.py
@@ -1017,7 +1017,7 @@ def generate_fetch_ivy(cls, jars, ivyxml, confs, resolve_hash_name):
 
   @classmethod
   def _write_ivy_xml_file(cls, ivyxml, template_data, template_relpath):
-    template_text = pkgutil.get_data(__name__, template_relpath)
+    template_text = pkgutil.get_data(__name__, template_relpath).decode('utf-8')
     generator = Generator(template_text, lib=template_data)
     with safe_open(ivyxml, 'w') as output:
       generator.write(output)
diff --git a/src/python/pants/backend/jvm/tasks/ivy_task_mixin.py b/src/python/pants/backend/jvm/tasks/ivy_task_mixin.py
index 64285d47736..acefaccc8db 100644
--- a/src/python/pants/backend/jvm/tasks/ivy_task_mixin.py
+++ b/src/python/pants/backend/jvm/tasks/ivy_task_mixin.py
@@ -51,13 +51,14 @@ def compute_fingerprint(self, target):
       return None
 
     hasher = hashlib.sha1()
-    hasher.update(target.payload.fingerprint().encode('utf-8'))
+    fingerprint = target.payload.fingerprint().encode('utf-8')
+    hasher.update(fingerprint)
 
     for conf in self._confs:
-      hasher.update(conf)
+      hasher.update(conf.encode('utf-8'))
 
     for element in hash_elements_for_target:
-      hasher.update(element)
+      hasher.update(element.encode('utf-8'))
 
     return hasher.hexdigest() if PY3 else hasher.hexdigest().decode('utf-8')
 
diff --git a/src/python/pants/java/nailgun_executor.py b/src/python/pants/java/nailgun_executor.py
index ed09aab16ff..ee4de3389f4 100644
--- a/src/python/pants/java/nailgun_executor.py
+++ b/src/python/pants/java/nailgun_executor.py
@@ -69,10 +69,10 @@ class NailgunExecutor(Executor, FingerprintedProcessManager):
   _NG_PORT_REGEX = re.compile(r'.*\s+port\s+(\d+)\.$')
 
   # Used to identify if we own a given nailgun server.
-  FINGERPRINT_CMD_KEY = b'-Dpants.nailgun.fingerprint'
-  _PANTS_NG_ARG_PREFIX = b'-Dpants.buildroot'
-  _PANTS_OWNER_ARG_PREFIX = b'-Dpants.nailgun.owner'
-  _PANTS_NG_BUILDROOT_ARG = b'='.join((_PANTS_NG_ARG_PREFIX, get_buildroot().encode('utf-8')))
+  FINGERPRINT_CMD_KEY = '-Dpants.nailgun.fingerprint'
+  _PANTS_NG_ARG_PREFIX = '-Dpants.buildroot'
+  _PANTS_OWNER_ARG_PREFIX = '-Dpants.nailgun.owner'
+  _PANTS_NG_BUILDROOT_ARG = '='.join((_PANTS_NG_ARG_PREFIX, get_buildroot()))
 
   _NAILGUN_SPAWN_LOCK = threading.Lock()
   _SELECT_WAIT = 1
@@ -103,10 +103,10 @@ def __str__(self):
 
   def _create_owner_arg(self, workdir):
     # Currently the owner is identified via the full path to the workdir.
-    return b'='.join((self._PANTS_OWNER_ARG_PREFIX, workdir))
+    return '='.join((self._PANTS_OWNER_ARG_PREFIX, workdir))
 
   def _create_fingerprint_arg(self, fingerprint):
-    return b'='.join((self.FINGERPRINT_CMD_KEY, fingerprint))
+    return '='.join((self.FINGERPRINT_CMD_KEY, fingerprint))
 
   @staticmethod
   def _fingerprint(jvm_options, classpath, java_version):
@@ -119,9 +119,11 @@ def _fingerprint(jvm_options, classpath, java_version):
     """
     digest = hashlib.sha1()
     # TODO(John Sirois): hash classpath contents?
-    [digest.update(item) for item in (b''.join(sorted(jvm_options)),
-                                      b''.join(sorted(classpath)),
-                                      repr(java_version).encode('utf-8'))]
+    encoded_jvm_options = [option.encode('utf-8') for option in sorted(jvm_options)]
+    encoded_classpath = [cp.encode('utf-8') for cp in sorted(classpath)]
+    encoded_java_version = repr(java_version).encode('utf-8')
+    for item in (encoded_jvm_options, encoded_classpath, encoded_java_version):
+      digest.update(str(item).encode('utf-8'))
     return digest.hexdigest() if PY3 else digest.hexdigest().decode('utf-8')
 
   def _runner(self, classpath, main, jvm_options, args, cwd=None):
diff --git a/src/python/pants/option/options_bootstrapper.py b/src/python/pants/option/options_bootstrapper.py
index e85c80101a3..2b7abfc4dd0 100644
--- a/src/python/pants/option/options_bootstrapper.py
+++ b/src/python/pants/option/options_bootstrapper.py
@@ -10,8 +10,6 @@
 import sys
 from builtins import filter, next, object, open
 
-from future.utils import binary_type
-
 from pants.base.build_environment import get_default_pants_config_file
 from pants.engine.fs import FileContent
 from pants.option.arg_splitter import GLOBAL_SCOPE, GLOBAL_SCOPE_CONFIG_SECTION
@@ -20,6 +18,7 @@
 from pants.option.global_options import GlobalOptionsRegistrar
 from pants.option.option_tracker import OptionTracker
 from pants.option.options import Options
+from pants.util.strutil import ensure_text
 
 
 logger = logging.getLogger(__name__)
@@ -150,8 +149,7 @@ def construct_and_set_bootstrap_options(self):
     """Populates the internal bootstrap_options cache."""
     def filecontent_for(path):
       with open(path, 'rb') as fh:
-        if isinstance(path, binary_type):
-          path = path.decode('utf-8')
+        path = ensure_text(path)
         return FileContent(path, fh.read())
 
     # N.B. This adaptor is meant to simulate how we would co-operatively invoke options bootstrap
diff --git a/src/python/pants/util/strutil.py b/src/python/pants/util/strutil.py
index 168751b7883..83cf7c96021 100644
--- a/src/python/pants/util/strutil.py
+++ b/src/python/pants/util/strutil.py
@@ -6,30 +6,31 @@
 
 import re
 import shlex
+from builtins import bytes, str
 
-from future.utils import binary_type, text_type
+from future.utils import PY3
 
 
 def ensure_binary(text_or_binary):
-  if isinstance(text_or_binary, binary_type):
+  if isinstance(text_or_binary, bytes):
     return text_or_binary
-  elif isinstance(text_or_binary, text_type):
+  elif isinstance(text_or_binary, str):
     return text_or_binary.encode('utf8')
   else:
     raise TypeError('Argument is neither text nor binary type.({})'.format(type(text_or_binary)))
 
 
 def ensure_text(text_or_binary):
-  if isinstance(text_or_binary, binary_type):
+  if isinstance(text_or_binary, bytes):
     return text_or_binary.decode('utf-8')
-  elif isinstance(text_or_binary, text_type):
+  elif isinstance(text_or_binary, str):
     return text_or_binary
   else:
     raise TypeError('Argument is neither text nor binary type ({})'.format(type(text_or_binary)))
 
 
 def is_text_or_binary(obj):
-  return isinstance(obj, (text_type, binary_type))
+  return isinstance(obj, (str, bytes))
 
 
 def safe_shlex_split(text_or_binary):
@@ -37,7 +38,8 @@ def safe_shlex_split(text_or_binary):
 
   Safe even on python versions whose shlex.split() method doesn't accept unicode.
   """
-  return shlex.split(ensure_binary(text_or_binary))
+  value = ensure_text(text_or_binary) if PY3 else ensure_binary(text_or_binary)
+  return shlex.split(value)
 
 
 # `_shell_unsafe_chars_pattern` and `shell_quote` are modified from the CPython 3.6 source:
diff --git a/tests/python/pants_test/base/context_utils.py b/tests/python/pants_test/base/context_utils.py
index 5a3a21757a1..ef42257a9bf 100644
--- a/tests/python/pants_test/base/context_utils.py
+++ b/tests/python/pants_test/base/context_utils.py
@@ -63,11 +63,14 @@ class TestLogger(logging.getLoggerClass()):
     This is so we can use a regular logger in tests instead of our reporting machinery.
     """
 
-    def makeRecord(self, name, lvl, fn, lno, msg, args, exc_info, func=None, extra=None):
+    def makeRecord(self, name, lvl, fn, lno, msg, args, exc_info, *pos_args, **kwargs):
+      # Python 2 and Python 3 have different arguments for makeRecord().
+      # For cross-compatibility, we are unpacking arguments.
+      # See https://stackoverflow.com/questions/44329421/logging-makerecord-takes-8-positional-arguments-but-11-were-given.
       msg = ''.join([msg] + [a[0] if isinstance(a, (list, tuple)) else a for a in args])
       args = []
       return super(TestContext.TestLogger, self).makeRecord(
-        name, lvl, fn, lno, msg, args, exc_info, func, extra)
+        name, lvl, fn, lno, msg, args, exc_info, *pos_args, **kwargs)
 
   def __init__(self, *args, **kwargs):
     super(TestContext, self).__init__(*args, **kwargs)
diff --git a/tests/python/pants_test/pants_run_integration_test.py b/tests/python/pants_test/pants_run_integration_test.py
index 4e64c6d7e63..bf2f9a847b9 100644
--- a/tests/python/pants_test/pants_run_integration_test.py
+++ b/tests/python/pants_test/pants_run_integration_test.py
@@ -24,6 +24,7 @@
 from pants.util.dirutil import safe_mkdir, safe_mkdir_for, safe_open
 from pants.util.objects import datatype
 from pants.util.process_handler import SubprocessProcessHandler, subprocess
+from pants.util.strutil import ensure_binary
 from pants_test.testutils.file_test_util import check_symlinks, contains_exact_files
 
 
@@ -38,6 +39,8 @@ def join(self, stdin_data=None, tee_output=False):
     communicate_fn = self.process.communicate
     if tee_output:
       communicate_fn = SubprocessProcessHandler(self.process).communicate_teeing_stdout_and_stderr
+    if stdin_data is not None:
+      stdin_data = ensure_binary(stdin_data)
     (stdout_data, stderr_data) = communicate_fn(stdin_data)
 
     return PantsResult(self.command, self.process.returncode, stdout_data.decode("utf-8"),