diff --git a/openedx/core/djangoapps/user_api/management/tests/test_populate_retirement_states.py b/openedx/core/djangoapps/user_api/management/tests/test_populate_retirement_states.py
index 8cc8fd8202..33c2ce103e 100644
--- a/openedx/core/djangoapps/user_api/management/tests/test_populate_retirement_states.py
+++ b/openedx/core/djangoapps/user_api/management/tests/test_populate_retirement_states.py
@@ -87,7 +87,7 @@ def test_out_of_order_start_state(settings):
     del settings.RETIREMENT_STATES[0]
     settings.RETIREMENT_STATES.insert(4, 'PENDING')
 
-    with pytest.raises(CommandError, match=ur'{} must be the first state'.format(START_STATE)):
+    with pytest.raises(CommandError, match=u'{} must be the first state'.format(START_STATE)):
         call_command('populate_retirement_states')
 
 
diff --git a/pavelib/paver_tests/test_paver_bok_choy_cmds.py b/pavelib/paver_tests/test_paver_bok_choy_cmds.py
index 69ad257eac..855f636e4d 100644
--- a/pavelib/paver_tests/test_paver_bok_choy_cmds.py
+++ b/pavelib/paver_tests/test_paver_bok_choy_cmds.py
@@ -6,7 +6,12 @@ from __future__ import absolute_import
 
 import os
 import unittest
-from test.test_support import EnvironmentVarGuard
+import six
+
+if six.PY2:
+    from test.test_support import EnvironmentVarGuard
+else:
+    from test.support import EnvironmentVarGuard   # pylint: disable=import-error,no-name-in-module
 
 from pavelib.utils.test.suites import BokChoyTestSuite