diff --git a/tests/roots/test-directive-only/conf.py b/tests/roots/test-directive-only/conf.py
new file mode 100644
index 000000000..eb3a3d0d2
--- /dev/null
+++ b/tests/roots/test-directive-only/conf.py
@@ -0,0 +1,2 @@
+
+project = 'test-directive-only'
diff --git a/tests/roots/test-only-directive/contents.rst b/tests/roots/test-directive-only/contents.rst
similarity index 68%
rename from tests/roots/test-only-directive/contents.rst
rename to tests/roots/test-directive-only/contents.rst
index 9a93be9e7..80ec00313 100644
--- a/tests/roots/test-only-directive/contents.rst
+++ b/tests/roots/test-directive-only/contents.rst
@@ -1,4 +1,4 @@
-test-only-directive
+test-directive-only
 ===================
 
 .. toctree::
diff --git a/tests/roots/test-only-directive/only.rst b/tests/roots/test-directive-only/only.rst
similarity index 100%
rename from tests/roots/test-only-directive/only.rst
rename to tests/roots/test-directive-only/only.rst
diff --git a/tests/roots/test-only-directive/conf.py b/tests/roots/test-only-directive/conf.py
deleted file mode 100644
index bcb4305da..000000000
--- a/tests/roots/test-only-directive/conf.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-project = 'test-only-directive'
diff --git a/tests/test_only_directive.py b/tests/test_directive_only.py
similarity index 92%
rename from tests/test_only_directive.py
rename to tests/test_directive_only.py
index b580183cc..7fb1f5bb9 100644
--- a/tests/test_only_directive.py
+++ b/tests/test_directive_only.py
@@ -17,10 +17,10 @@ from util import with_app, test_roots
 
 
 def teardown_module():
-    (test_roots / 'test-only-directive' / '_build').rmtree(True)
+    (test_roots / 'test-directive-only' / '_build').rmtree(True)
 
 
-@with_app(buildername='text', srcdir=(test_roots / 'test-only-directive'))
+@with_app(buildername='text', srcdir=(test_roots / 'test-directive-only'))
 def test_sectioning(app):
 
     def getsects(section):
diff --git a/tests/test_cpp_domain.py b/tests/test_domain_cpp.py
similarity index 99%
rename from tests/test_cpp_domain.py
rename to tests/test_domain_cpp.py
index 38d167545..0b4219a52 100644
--- a/tests/test_cpp_domain.py
+++ b/tests/test_domain_cpp.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    test_cpp_domain
+    test_domain_cpp
     ~~~~~~~~~~~~~~~
 
     Tests the C++ Domain
diff --git a/tests/test_std_domain.py b/tests/test_domain_std.py
similarity index 95%
rename from tests/test_std_domain.py
rename to tests/test_domain_std.py
index c93c5f522..81dbe6a4e 100644
--- a/tests/test_std_domain.py
+++ b/tests/test_domain_std.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    test_std_domain
+    test_domain_std
     ~~~~~~~~~~~~~~~
 
     Tests the std domain