diff --git a/MANIFEST.in b/MANIFEST.in
index 370da07..1fe78fa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,6 +5,6 @@ include mmgen_node_tools/data/*
 include test/init.sh
 include test/test-release.d/*.sh
 include test/unit_tests_d/*.py
-include test/cmdtest_py_d/*.py
+include test/cmdtest_d/*.py
 include test/overlay/fakemods/mmgen_node_tools/*.py
 include test/ref/*/*
diff --git a/test/cmdtest_py_d/cfg.py b/test/cmdtest_d/cfg.py
similarity index 93%
rename from test/cmdtest_py_d/cfg.py
rename to test/cmdtest_d/cfg.py
index ef52880..c28ce5d 100755
--- a/test/cmdtest_py_d/cfg.py
+++ b/test/cmdtest_d/cfg.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen-node-tools
 
 """
-test.cmdtest_py_d.cfg: configuration data for cmdtest.py
+test.cmdtest_d.cfg: configuration data for cmdtest.py
 """
 
 cmd_groups_altcoin = []
diff --git a/test/cmdtest_py_d/ct_main.py b/test/cmdtest_d/ct_main.py
similarity index 96%
rename from test/cmdtest_py_d/ct_main.py
rename to test/cmdtest_d/ct_main.py
index d52a2e3..3009d2f 100755
--- a/test/cmdtest_py_d/ct_main.py
+++ b/test/cmdtest_d/ct_main.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen-wallet
 
 """
-cmdtest_py_d.ct_main: Basic operations tests for the cmdtest.py test suite
+cmdtest_d.ct_main: Basic operations tests for the cmdtest.py test suite
 """
 
 import sys,time
diff --git a/test/cmdtest_py_d/ct_misc.py b/test/cmdtest_d/ct_misc.py
similarity index 99%
rename from test/cmdtest_py_d/ct_misc.py
rename to test/cmdtest_d/ct_misc.py
index 6ac7d37..15b109e 100755
--- a/test/cmdtest_py_d/ct_misc.py
+++ b/test/cmdtest_d/ct_misc.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen-node-tools
 
 """
-test.cmdtest_py_d.ct_misc: Miscellaneous test groups for the cmdtest.py test suite
+test.cmdtest_d.ct_misc: Miscellaneous test groups for the cmdtest.py test suite
 """
 
 import os,shutil
diff --git a/test/cmdtest_py_d/ct_regtest.py b/test/cmdtest_d/ct_regtest.py
similarity index 99%
rename from test/cmdtest_py_d/ct_regtest.py
rename to test/cmdtest_d/ct_regtest.py
index f1b2774..24f19b9 100755
--- a/test/cmdtest_py_d/ct_regtest.py
+++ b/test/cmdtest_d/ct_regtest.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen-node-tools
 
 """
-test.cmdtest_py_d.ct_regtest: Regtest tests for the cmdtest.py test suite
+test.cmdtest_d.ct_regtest: Regtest tests for the cmdtest.py test suite
 """
 
 import sys,os
diff --git a/test/init.sh b/test/init.sh
index a379adf..8f77c82 100755
--- a/test/init.sh
+++ b/test/init.sh
@@ -87,8 +87,8 @@ create_test_links() {
 		test/cmdtest.py                hard
 		test/unit_tests.py             hard
 		test/test-release.sh           symbolic
-		test/cmdtest_py_d/common.py    symbolic
-		test/cmdtest_py_d/ct_base.py   symbolic
+		test/cmdtest_d/common.py       symbolic
+		test/cmdtest_d/ct_base.py      symbolic
 		cmds/mmgen-regtest             symbolic
 	'
 	while read path type; do
diff --git a/test/test-release.d/cfg.sh b/test/test-release.d/cfg.sh
index b371e72..7a393df 100755
--- a/test/test-release.d/cfg.sh
+++ b/test/test-release.d/cfg.sh
@@ -42,7 +42,7 @@ init_tests() {
 	t_lint="
 		- $pylint --errors-only mmgen_node_tools
 		- $pylint --errors-only test
-		- $pylint --errors-only --disable=relative-beyond-top-level test/cmdtest_py_d
+		- $pylint --errors-only --disable=relative-beyond-top-level test/cmdtest_d
 	"
 
 	d_unit="low-level subsystems"