diff --git a/pavelib/paver_tests/test_paver_bok_choy_cmds.py b/pavelib/paver_tests/test_paver_bok_choy_cmds.py
index ed7b9db214..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.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