diff --git a/irctest/__main__.py b/irctest/__main__.py
index 1fa86b5..61458f9 100644
--- a/irctest/__main__.py
+++ b/irctest/__main__.py
@@ -16,7 +16,7 @@ def main(args):
 
     controller_class = module.get_irctest_controller_class()
     if issubclass(controller_class, BaseClientController):
-        module = 'irctest.clienttests'
+        module = 'irctest.client_tests'
     elif issubclass(controller_class, BaseClientController):
         module = 'irctest.servertests'
     else:
diff --git a/irctest/clienttests/__init__.py b/irctest/client_tests/__init__.py
similarity index 100%
rename from irctest/clienttests/__init__.py
rename to irctest/client_tests/__init__.py
diff --git a/irctest/clienttests/test_cap.py b/irctest/client_tests/test_cap.py
similarity index 100%
rename from irctest/clienttests/test_cap.py
rename to irctest/client_tests/test_cap.py
diff --git a/irctest/clienttests/test_sasl.py b/irctest/client_tests/test_sasl.py
similarity index 100%
rename from irctest/clienttests/test_sasl.py
rename to irctest/client_tests/test_sasl.py