diff --git a/surveil/tests/api/controllers/v1/test_commands.py b/surveil/tests/api/controllers/v1/test_commands.py
index 917024e..2ffa44a 100644
--- a/surveil/tests/api/controllers/v1/test_commands.py
+++ b/surveil/tests/api/controllers/v1/test_commands.py
@@ -18,10 +18,10 @@ import json
 from surveil.tests.api import functionalTest
 
 
-class TestRootController(functionalTest.FunctionalTest):
+class TestCommandController(functionalTest.FunctionalTest):
 
     def setUp(self):
-        super(TestRootController, self).setUp()
+        super(TestCommandController, self).setUp()
         self.commands = [
             {u"command_name": u"check_test1",
              u"command_line": u"/test/test1/test.py"},
diff --git a/surveil/tests/api/controllers/v1/test_hello.py b/surveil/tests/api/controllers/v1/test_hello.py
index 03111b4..47a9082 100644
--- a/surveil/tests/api/controllers/v1/test_hello.py
+++ b/surveil/tests/api/controllers/v1/test_hello.py
@@ -15,7 +15,7 @@
 from surveil.tests.api import functionalTest
 
 
-class TestRootController(functionalTest.FunctionalTest):
+class TestHelloController(functionalTest.FunctionalTest):
 
     def test_get(self):
         response = self.app.get('/v1/hello')
diff --git a/surveil/tests/api/controllers/v1/test_hosts.py b/surveil/tests/api/controllers/v1/test_hosts.py
index 39069a0..386feea 100644
--- a/surveil/tests/api/controllers/v1/test_hosts.py
+++ b/surveil/tests/api/controllers/v1/test_hosts.py
@@ -18,10 +18,10 @@ import json
 from surveil.tests.api import functionalTest
 
 
-class TestRootController(functionalTest.FunctionalTest):
+class TestHostController(functionalTest.FunctionalTest):
 
     def setUp(self):
-        super(TestRootController, self).setUp()
+        super(TestHostController, self).setUp()
         self.hosts = [
             {
                 "host_name": "bogus-router", "address": "192.168.1.254",