diff --git a/earwigbot/tests/test_calc.py b/earwigbot/tests/test_calc.py
index 4c175c5..240fcbe 100644
--- a/earwigbot/tests/test_calc.py
+++ b/earwigbot/tests/test_calc.py
@@ -23,8 +23,9 @@
 import unittest
 
 from earwigbot.commands.calc import Command
+from earwigbot.tests import CommandTestCase
 
-class TestCalc(support.CommandTestCase):
+class TestCalc(CommandTestCase):
 
     def setUp(self):
         super(TestCalc, self).setUp(Command)
diff --git a/earwigbot/tests/test_test.py b/earwigbot/tests/test_test.py
index be077cd..3aeaa23 100644
--- a/earwigbot/tests/test_test.py
+++ b/earwigbot/tests/test_test.py
@@ -23,8 +23,9 @@
 import unittest
 
 from earwigbot.commands.test import Command
+from earwigbot.tests import CommandTestCase
 
-class TestTest(support.CommandTestCase):
+class TestTest(CommandTestCase):
 
     def setUp(self):
         super(TestTest, self).setUp(Command)