diff --git a/test/cmdtest.py b/test/cmdtest.py
index 3ce6c3a6..a00d0281 100755
--- a/test/cmdtest.py
+++ b/test/cmdtest.py
@@ -236,13 +236,13 @@ else:
 if cfg.skipping_deps:
 	cfg.no_daemon_autostart = True
 
-from test.cmdtest_d.cfg import cfgs
+from test.cmdtest_d.include.cfg import cfgs
 
 def list_cmds():
 
 	def gen_output():
 
-		from test.cmdtest_d.group_mgr import CmdGroupMgr
+		from test.cmdtest_d.include.group_mgr import CmdGroupMgr
 		gm = CmdGroupMgr(cfg)
 		cw, d = 0, []
 
@@ -297,7 +297,7 @@ if __name__ == '__main__':
 		create_tmp_dirs(shm_dir)
 
 	if cfg.list_cmd_groups:
-		from test.cmdtest_d.group_mgr import CmdGroupMgr
+		from test.cmdtest_d.include.group_mgr import CmdGroupMgr
 		CmdGroupMgr(cfg).list_cmd_groups()
 		sys.exit(0)
 	elif cfg.list_cmds:
@@ -308,7 +308,7 @@ if __name__ == '__main__':
 		set_restore_term_at_exit()
 
 	from mmgen.exception import TestSuiteSpawnedScriptException
-	from test.cmdtest_d.runner import CmdTestRunner
+	from test.cmdtest_d.include.runner import CmdTestRunner
 
 	try:
 		tr = CmdTestRunner(cfg, repo_root, data_dir, trash_dir, trash_dir2)
diff --git a/test/cmdtest_d/ct_automount.py b/test/cmdtest_d/automount.py
similarity index 98%
rename from test/cmdtest_d/ct_automount.py
rename to test/cmdtest_d/automount.py
index 1d365e78..3da8f919 100755
--- a/test/cmdtest_d/ct_automount.py
+++ b/test/cmdtest_d/automount.py
@@ -9,12 +9,12 @@
 #   https://gitlab.com/mmgen/mmgen-wallet
 
 """
-test.cmdtest_d.ct_automount: autosigning with automount tests for the cmdtest.py test suite
+test.cmdtest_d.automount: autosigning with automount tests for the cmdtest.py test suite
 """
 import time
 
-from .ct_autosign import CmdTestAutosignThreaded
-from .ct_regtest import CmdTestRegtest, rt_pw
+from .autosign import CmdTestAutosignThreaded
+from .regtest import CmdTestRegtest, rt_pw
 from ..include.common import gr_uc
 
 class CmdTestAutosignAutomount(CmdTestAutosignThreaded, CmdTestRegtest):
diff --git a/test/cmdtest_d/ct_automount_eth.py b/test/cmdtest_d/automount_eth.py
similarity index 95%
rename from test/cmdtest_d/ct_automount_eth.py
rename to test/cmdtest_d/automount_eth.py
index 9d15c4a0..4bab78f5 100755
--- a/test/cmdtest_d/ct_automount_eth.py
+++ b/test/cmdtest_d/automount_eth.py
@@ -9,13 +9,13 @@
 #   https://gitlab.com/mmgen/mmgen-wallet
 
 """
-test.cmdtest_d.ct_automount_eth: Ethereum automount autosigning tests for the cmdtest.py test suite
+test.cmdtest_d.automount_eth: Ethereum automount autosigning tests for the cmdtest.py test suite
 """
 import os, re
 
-from .ct_autosign import CmdTestAutosignThreaded
-from .ct_ethdev import CmdTestEthdev, parity_devkey_fn
-from .common import dfl_words_file
+from .autosign import CmdTestAutosignThreaded
+from .ethdev import CmdTestEthdev, parity_devkey_fn
+from .include.common import dfl_words_file
 from ..include.common import cfg
 
 class CmdTestAutosignETH(CmdTestAutosignThreaded, CmdTestEthdev):
diff --git a/test/cmdtest_d/ct_autosign.py b/test/cmdtest_d/autosign.py
similarity index 99%
rename from test/cmdtest_d/ct_autosign.py
rename to test/cmdtest_d/autosign.py
index c390935b..9df14434 100755
--- a/test/cmdtest_d/ct_autosign.py
+++ b/test/cmdtest_d/autosign.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_d.ct_autosign: Autosign tests for the cmdtest.py test suite
+test.cmdtest_d.autosign: Autosign tests for the cmdtest.py test suite
 """
 
 import sys, os, time, shutil, atexit
@@ -44,10 +44,10 @@ from ..include.common import (
 	end_silence,
 	VirtBlockDevice,
 )
-from .common import ref_dir, dfl_words_file, dfl_bip39_file
+from .include.common import ref_dir, dfl_words_file, dfl_bip39_file
 
-from .ct_base import CmdTestBase
-from .input import stealth_mnemonic_entry
+from .base import CmdTestBase
+from .include.input import stealth_mnemonic_entry
 
 class CmdTestAutosignBase(CmdTestBase):
 	networks     = ('btc',)
@@ -771,7 +771,7 @@ class CmdTestAutosign(CmdTestAutosignBase):
 
 		assert op in ('copy', 'set_count', 'remove_signed')
 
-		from .ct_ref import CmdTestRef
+		from .ref import CmdTestRef
 		def gen():
 			d = CmdTestRef.sources['ref_tx_file']
 			dirmap = [e for e in self.filedir_map if e[0] in (txfile_coins or self.txfile_coins)]
diff --git a/test/cmdtest_d/ct_base.py b/test/cmdtest_d/base.py
similarity index 97%
rename from test/cmdtest_d/ct_base.py
rename to test/cmdtest_d/base.py
index a1646aa2..6c293185 100755
--- a/test/cmdtest_d/ct_base.py
+++ b/test/cmdtest_d/base.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_d.ct_base: Base class for the cmdtest.py test suite
+test.cmdtest_d.base: Base class for the cmdtest.py test suite
 """
 
 import sys, os
@@ -26,7 +26,7 @@ from mmgen.util import msg
 from mmgen.color import gray, purple, yellow
 
 from ..include.common import write_to_file, read_from_file, imsg
-from .common import get_file_with_ext
+from .include.common import get_file_with_ext
 
 class CmdTestBase:
 	'initializer class for the cmdtest.py test suite'
diff --git a/test/cmdtest_d/ct_cfgfile.py b/test/cmdtest_d/cfgfile.py
similarity index 98%
rename from test/cmdtest_d/ct_cfgfile.py
rename to test/cmdtest_d/cfgfile.py
index 42873706..d8dfa1b9 100755
--- a/test/cmdtest_d/ct_cfgfile.py
+++ b/test/cmdtest_d/cfgfile.py
@@ -7,7 +7,7 @@
 # Licensed according to the terms of GPL Version 3.  See LICENSE for details.
 
 """
-test.cmdtest_d.ct_cfgfile: CfgFile tests for the MMGen cmdtest.py test suite
+test.cmdtest_d.cfgfile: CfgFile tests for the MMGen cmdtest.py test suite
 """
 
 import sys, os, time, shutil
@@ -16,7 +16,7 @@ from mmgen.color import yellow
 from mmgen.cfgfile import CfgFileSampleSys, CfgFileSampleUsr, cfg_file_sample
 
 from ..include.common import read_from_file, write_to_file, imsg
-from .ct_base import CmdTestBase
+from .base import CmdTestBase
 
 class CmdTestCfgFile(CmdTestBase):
 	'CfgFile API'
diff --git a/test/cmdtest_d/ct_chainsplit.py b/test/cmdtest_d/chainsplit.py
similarity index 96%
rename from test/cmdtest_d/ct_chainsplit.py
rename to test/cmdtest_d/chainsplit.py
index f4cfa097..56799c52 100755
--- a/test/cmdtest_d/ct_chainsplit.py
+++ b/test/cmdtest_d/chainsplit.py
@@ -17,14 +17,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_d.ct_chainsplit: Forking scenario tests for the cmdtest.py test suite
+test.cmdtest_d.chainsplit: Forking scenario tests for the cmdtest.py test suite
 This module is unmaintained and currently non-functional
 """
 
 from mmgen.util import die
 
-from .common import get_file_with_ext, rt_pw
-from .ct_regtest import CmdTestRegtest
+from .include.common import get_file_with_ext, rt_pw
+from .regtest import CmdTestRegtest
 
 class CmdTestChainsplit(CmdTestRegtest):
 	'forking scenario tests for the cmdtest.py test suite'
diff --git a/test/cmdtest_d/ct_ethdev.py b/test/cmdtest_d/ethdev.py
similarity index 99%
rename from test/cmdtest_d/ct_ethdev.py
rename to test/cmdtest_d/ethdev.py
index fb64e635..ebb009fb 100755
--- a/test/cmdtest_d/ct_ethdev.py
+++ b/test/cmdtest_d/ethdev.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_d.ct_ethdev: Ethdev tests for the cmdtest.py test suite
+test.cmdtest_d.ethdev: Ethdev tests for the cmdtest.py test suite
 """
 
 import sys, time, os, re, shutil, asyncio, json
@@ -45,7 +45,7 @@ from ..include.common import (
 	gr_uc,
 	stop_test_daemons
 )
-from .common import (
+from .include.common import (
 	ref_dir,
 	dfl_words_file,
 	tx_comment_jp,
@@ -56,8 +56,8 @@ from .common import (
 	ok_msg,
 	Ctrl_U
 )
-from .ct_base import CmdTestBase
-from .ct_shared import CmdTestShared
+from .base import CmdTestBase
+from .shared import CmdTestShared
 from .httpd.etherscan import EtherscanServer
 
 etherscan_server = EtherscanServer()
diff --git a/test/cmdtest_d/ct_ethswap.py b/test/cmdtest_d/ethswap.py
similarity index 95%
rename from test/cmdtest_d/ct_ethswap.py
rename to test/cmdtest_d/ethswap.py
index efb49361..b19c00a7 100755
--- a/test/cmdtest_d/ct_ethswap.py
+++ b/test/cmdtest_d/ethswap.py
@@ -9,21 +9,21 @@
 #   https://gitlab.com/mmgen/mmgen-wallet
 
 """
-test.cmdtest_d.ct_ethswap: Ethereum swap tests for the cmdtest.py test suite
+test.cmdtest_d.ethswap: Ethereum swap tests for the cmdtest.py test suite
 """
 
 from mmgen.wallet.mmgen import wallet as MMGenWallet
 from mmgen.cfg import Config
 from mmgen.protocol import init_proto
 
-from .runner import CmdTestRunner
+from .include.runner import CmdTestRunner
 
-from .common import dfl_words_file, dfl_seed_id, rt_pw
+from .include.common import dfl_words_file, dfl_seed_id, rt_pw
 
 from .httpd.thornode import ThornodeServer
-from .ct_regtest import CmdTestRegtest
-from .ct_swap import CmdTestSwapMethods
-from .ct_ethdev import CmdTestEthdev
+from .regtest import CmdTestRegtest
+from .swap import CmdTestSwapMethods
+from .ethdev import CmdTestEthdev
 
 thornode_server = ThornodeServer()
 
diff --git a/test/cmdtest_d/ct_help.py b/test/cmdtest_d/help.py
similarity index 98%
rename from test/cmdtest_d/ct_help.py
rename to test/cmdtest_d/help.py
index 64f0a753..b764f89f 100755
--- a/test/cmdtest_d/ct_help.py
+++ b/test/cmdtest_d/help.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen-wallet
 
 """
-test.cmdtest_d.ct_help: helpscreen test group for the cmdtest.py test suite
+test.cmdtest_d.help: helpscreen test group for the cmdtest.py test suite
 """
 
 import sys, os, time
@@ -17,7 +17,7 @@ import sys, os, time
 from mmgen.util import ymsg
 from mmgen.cfg import gc
 
-from .ct_base import CmdTestBase
+from .base import CmdTestBase
 
 class CmdTestHelp(CmdTestBase):
 	'help, info and usage screens'
diff --git a/test/cmdtest_d/cfg.py b/test/cmdtest_d/include/cfg.py
similarity index 98%
rename from test/cmdtest_d/cfg.py
rename to test/cmdtest_d/include/cfg.py
index d7beb601..32cdd104 100755
--- a/test/cmdtest_d/cfg.py
+++ b/test/cmdtest_d/include/cfg.py
@@ -9,11 +9,11 @@
 #   https://gitlab.com/mmgen/mmgen-wallet
 
 """
-test.cmdtest_d.cfg: configuration data for cmdtest.py
+test.cmdtest_d.include.cfg: configuration data for cmdtest.py
 """
 
+from ...include.common import cfg
 from .common import pwfile, hincog_fn, incog_id_fn, randbool
-from ..include.common import cfg
 
 cmd_groups_altcoin = ['ref_altcoin', 'autosign', 'ethdev', 'xmrwallet', 'xmr_autosign']
 
diff --git a/test/cmdtest_d/common.py b/test/cmdtest_d/include/common.py
similarity index 96%
rename from test/cmdtest_d/common.py
rename to test/cmdtest_d/include/common.py
index 9bb08695..0fca79fc 100755
--- a/test/cmdtest_d/common.py
+++ b/test/cmdtest_d/include/common.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_d.common: Shared routines and data for the cmdtest.py test suite
+test.cmdtest_d.include.common: Shared routines and data for the cmdtest.py test suite
 """
 
 import sys, os
@@ -25,7 +25,7 @@ import sys, os
 from mmgen.color import green, blue, gray
 from mmgen.util import msg
 
-from ..include.common import cfg, getrand, text_jp, text_zh, ascii_cyr_gr, lat_cyr_gr
+from ...include.common import cfg, getrand, text_jp, text_zh, ascii_cyr_gr, lat_cyr_gr
 
 rt_pw = 'abc-α'
 ref_wallet_brainpass = 'abc'
diff --git a/test/cmdtest_d/group_mgr.py b/test/cmdtest_d/include/group_mgr.py
similarity index 97%
rename from test/cmdtest_d/group_mgr.py
rename to test/cmdtest_d/include/group_mgr.py
index 912d61d7..1ab22342 100755
--- a/test/cmdtest_d/group_mgr.py
+++ b/test/cmdtest_d/include/group_mgr.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen-wallet
 
 """
-test.include.group_mgr: Command group manager for the MMGen Wallet cmdtest suite
+cmdtest_d.include.group_mgr: Command group manager for the MMGen Wallet cmdtest suite
 """
 
 import sys, os, time
@@ -84,7 +84,7 @@ class CmdGroupMgr:
 		if modname is None and 'modname' in kwargs:
 			modname = kwargs['modname']
 		import importlib
-		modpath = f'test.cmdtest_d.ct_{modname or gname}'
+		modpath = f'test.cmdtest_d.{modname or gname}'
 		return getattr(importlib.import_module(modpath), clsname)
 
 	def create_group(self, gname, sg_name, full_data=False, modname=None, is3seed=False, add_dpy=False):
diff --git a/test/cmdtest_d/runner.py b/test/cmdtest_d/include/runner.py
similarity index 99%
rename from test/cmdtest_d/runner.py
rename to test/cmdtest_d/include/runner.py
index 6487962d..af35869d 100755
--- a/test/cmdtest_d/runner.py
+++ b/test/cmdtest_d/include/runner.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen-wallet
 
 """
-test.include.runner: test runner for the MMGen Wallet cmdtest suite
+test.cmdtest_d.include.runner: test runner for the MMGen Wallet cmdtest suite
 """
 
 import sys, os, time, asyncio
@@ -18,7 +18,7 @@ from mmgen.cfg import gc
 from mmgen.color import red, yellow, green, blue, cyan, gray, nocolor
 from mmgen.util import msg, Msg, rmsg, bmsg, die, suf, make_timestr
 
-from test.include.common import (
+from ...include.common import (
 	cmdtest_py_log_fn,
 	iqmsg,
 	omsg,
@@ -229,7 +229,7 @@ class CmdTestRunner:
 
 	def init_group(self, gname, sg_name=None, cmd=None, quiet=False, do_clean=True):
 
-		from test.cmdtest_d.cfg import cmd_groups_altcoin
+		from .cfg import cmd_groups_altcoin
 		if self.cfg.no_altcoin and gname in cmd_groups_altcoin:
 			omsg(gray(f'INFO → skipping test group {gname!r} (--no-altcoin)'))
 			return None
diff --git a/test/cmdtest_d/xinput.py b/test/cmdtest_d/include/xinput.py
similarity index 100%
rename from test/cmdtest_d/xinput.py
rename to test/cmdtest_d/include/xinput.py
diff --git a/test/cmdtest_d/ct_input.py b/test/cmdtest_d/input.py
similarity index 98%
rename from test/cmdtest_d/ct_input.py
rename to test/cmdtest_d/input.py
index 700abcab..d4151868 100755
--- a/test/cmdtest_d/ct_input.py
+++ b/test/cmdtest_d/input.py
@@ -7,7 +7,7 @@
 # Licensed according to the terms of GPL Version 3.  See LICENSE for details.
 
 """
-test.cmdtest_d.ct_input: user input tests for the MMGen cmdtest.py test suite
+test.cmdtest_d.input: user input tests for the MMGen cmdtest.py test suite
 """
 
 import sys, os
@@ -24,9 +24,9 @@ from ..include.common import (
 	read_from_file,
 	strip_ansi_escapes
 )
-from .common import Ctrl_U, ref_dir
-from .ct_base import CmdTestBase
-from .input import stealth_mnemonic_entry, user_dieroll_entry
+from .include.common import Ctrl_U, ref_dir
+from .base import CmdTestBase
+from .include.input import stealth_mnemonic_entry, user_dieroll_entry
 
 hold_protect_delay = 2 if sys.platform == 'darwin' else None
 
diff --git a/test/cmdtest_d/ct_main.py b/test/cmdtest_d/main.py
similarity index 99%
rename from test/cmdtest_d/ct_main.py
rename to test/cmdtest_d/main.py
index 9bc0390d..22f50b28 100755
--- a/test/cmdtest_d/ct_main.py
+++ b/test/cmdtest_d/main.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_d.ct_main: Basic operations tests for the cmdtest.py test suite
+test.cmdtest_d.main: Basic operations tests for the cmdtest.py test suite
 """
 
 import sys, os
@@ -41,7 +41,7 @@ from ..include.common import (
 	getrandhex,
 	strip_ansi_escapes
 )
-from .common import (
+from .include.common import (
 	pwfile,
 	hincog_fn,
 	get_file_with_ext,
@@ -53,8 +53,8 @@ from .common import (
 	incog_id_fn,
 	non_mmgen_fn
 )
-from .ct_base import CmdTestBase
-from .ct_shared import CmdTestShared
+from .base import CmdTestBase
+from .shared import CmdTestShared
 
 def make_brainwallet_file(cfg, fn):
 	# Print random words with random whitespace in between
diff --git a/test/cmdtest_d/ct_misc.py b/test/cmdtest_d/misc.py
similarity index 97%
rename from test/cmdtest_d/ct_misc.py
rename to test/cmdtest_d/misc.py
index a67b924d..44df77b2 100755
--- a/test/cmdtest_d/ct_misc.py
+++ b/test/cmdtest_d/misc.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_d.ct_misc: Miscellaneous test groups for the cmdtest.py test suite
+test.cmdtest_d.misc: Miscellaneous test groups for the cmdtest.py test suite
 """
 
 import sys, re
@@ -25,9 +25,9 @@ import sys, re
 from mmgen.util import die
 
 from ..include.common import start_test_daemons, stop_test_daemons, imsg
-from .common import get_file_with_ext, dfl_words_file
-from .ct_base import CmdTestBase
-from .ct_main import CmdTestMain
+from .include.common import get_file_with_ext, dfl_words_file
+from .base import CmdTestBase
+from .main import CmdTestMain
 
 class CmdTestDev(CmdTestBase):
 	'developer scripts'
diff --git a/test/cmdtest_d/ct_opts.py b/test/cmdtest_d/opts.py
similarity index 99%
rename from test/cmdtest_d/ct_opts.py
rename to test/cmdtest_d/opts.py
index af8a3c1c..3b07df02 100755
--- a/test/cmdtest_d/ct_opts.py
+++ b/test/cmdtest_d/opts.py
@@ -7,12 +7,12 @@
 # Licensed according to the terms of GPL Version 3.  See LICENSE for details.
 
 """
-test.cmdtest_d.ct_opts: options processing tests for the MMGen cmdtest.py test suite
+test.cmdtest_d.opts: options processing tests for the MMGen cmdtest.py test suite
 """
 
 import os, time
 
-from .ct_base import CmdTestBase
+from .base import CmdTestBase
 
 class CmdTestOpts(CmdTestBase):
 	'command-line options parsing and processing'
diff --git a/test/cmdtest_d/ct_ref.py b/test/cmdtest_d/ref.py
similarity index 98%
rename from test/cmdtest_d/ct_ref.py
rename to test/cmdtest_d/ref.py
index 604faad1..3e6f6558 100755
--- a/test/cmdtest_d/ct_ref.py
+++ b/test/cmdtest_d/ref.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_d.ct_ref: Reference file tests for the cmdtest.py test suite
+test.cmdtest_d.ref: Reference file tests for the cmdtest.py test suite
 """
 
 import os
@@ -33,7 +33,7 @@ from ..include.common import (
 	read_from_file,
 	sample_text
 )
-from .common import (
+from .include.common import (
 	dfl_words_file,
 	ref_dir,
 	chksum_pat,
@@ -45,8 +45,8 @@ from .common import (
 	skip
 )
 
-from .ct_base import CmdTestBase
-from .ct_shared import CmdTestShared
+from .base import CmdTestBase
+from .shared import CmdTestShared
 
 wpasswd = 'reference password'
 
diff --git a/test/cmdtest_d/ct_ref_3seed.py b/test/cmdtest_d/ref_3seed.py
similarity index 98%
rename from test/cmdtest_d/ct_ref_3seed.py
rename to test/cmdtest_d/ref_3seed.py
index 5ca669eb..82f9931c 100755
--- a/test/cmdtest_d/ct_ref_3seed.py
+++ b/test/cmdtest_d/ref_3seed.py
@@ -17,8 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_d.ct_ref_3seed: Saved and generated reference file tests for 128,
-                             192 and 256-bit seeds for the cmdtest.py test suite
+test.cmdtest_d.ref_3seed: Saved and generated reference file tests for 128,
+                          192 and 256-bit seeds for the cmdtest.py test suite
 """
 
 import os
@@ -27,7 +27,7 @@ from mmgen.util import msg, capfirst
 from mmgen.wallet import get_wallet_cls
 
 from ..include.common import cmp_or_die, joinpath
-from .common import (
+from .include.common import (
 	pwfile,
 	ref_wallet_hash_preset,
 	ref_wallet_brainpass,
@@ -35,9 +35,9 @@ from .common import (
 	ref_dir,
 	ok_msg
 )
-from .ct_base import CmdTestBase
-from .ct_shared import CmdTestShared
-from .ct_wallet import CmdTestWalletConv
+from .base import CmdTestBase
+from .shared import CmdTestShared
+from .wallet import CmdTestWalletConv
 
 class CmdTestRef3Seed(CmdTestBase, CmdTestShared):
 	'saved wallet files for 128-, 192- and 256-bit seeds + generated filename checks'
@@ -65,7 +65,7 @@ class CmdTestRef3Seed(CmdTestBase, CmdTestShared):
 		('ref_mn_chk',       ([], 'saved native MMGen mnemonic file')),
 		('ref_bip39_chk',    ([], 'saved BIP39 mnemonic file')),
 		('ref_hincog_chk',   ([], 'saved hidden incog reference wallet')),
-		('ref_brain_chk',    ([], 'saved brainwallet')),                    # in ct_shared
+		('ref_brain_chk',    ([], 'saved brainwallet')),                    # in shared
 
 		# generating new reference ('abc' brainwallet) wallets for filename checks:
 		('ref_walletgen_brain',         ([], 'generating new reference wallet + filename check (brain)')),
diff --git a/test/cmdtest_d/ct_ref_altcoin.py b/test/cmdtest_d/ref_altcoin.py
similarity index 97%
rename from test/cmdtest_d/ct_ref_altcoin.py
rename to test/cmdtest_d/ref_altcoin.py
index d45ca797..0ce9451a 100755
--- a/test/cmdtest_d/ct_ref_altcoin.py
+++ b/test/cmdtest_d/ref_altcoin.py
@@ -17,15 +17,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_d.ct_ref_altcoin: Altcoin reference file tests for the cmdtest.py test suite
+test.cmdtest_d.ref_altcoin: Altcoin reference file tests for the cmdtest.py test suite
 """
 
 from mmgen.color import set_vt100
 
-from .common import pwfile, dfl_wpasswd, ref_dir, dfl_words_file, dfl_addr_idx_list
+from .include.common import pwfile, dfl_wpasswd, ref_dir, dfl_words_file, dfl_addr_idx_list
 from ..include.common import joinpath, start_test_daemons, stop_test_daemons, cmp_or_die
-from .ct_ref import CmdTestRef
-from .ct_base import CmdTestBase
+from .ref import CmdTestRef
+from .base import CmdTestBase
 
 class CmdTestRefAltcoin(CmdTestRef, CmdTestBase):
 	'saved and generated altcoin reference files'
diff --git a/test/cmdtest_d/ct_regtest.py b/test/cmdtest_d/regtest.py
similarity index 99%
rename from test/cmdtest_d/ct_regtest.py
rename to test/cmdtest_d/regtest.py
index 78737b22..35f5453f 100755
--- a/test/cmdtest_d/ct_regtest.py
+++ b/test/cmdtest_d/regtest.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_d.ct_regtest: Regtest tests for the cmdtest.py test suite
+test.cmdtest_d.regtest: Regtest tests for the cmdtest.py test suite
 """
 
 import os, json, time, re
@@ -46,7 +46,7 @@ from ..include.common import (
 	getrandhex,
 	make_burn_addr)
 
-from .common import (
+from .include.common import (
 	ok_msg,
 	get_file_with_ext,
 	get_comment,
@@ -56,8 +56,8 @@ from .common import (
 	get_env_without_debug_vars,
 	rt_pw)
 
-from .ct_base import CmdTestBase
-from .ct_shared import CmdTestShared
+from .base import CmdTestBase
+from .shared import CmdTestShared
 
 pat_date = r'\b\d\d-\d\d-\d\d\b'
 pat_date_time = r'\b\d\d\d\d-\d\d-\d\d\s+\d\d:\d\d\b'
diff --git a/test/cmdtest_d/ct_seedsplit.py b/test/cmdtest_d/seedsplit.py
similarity index 98%
rename from test/cmdtest_d/ct_seedsplit.py
rename to test/cmdtest_d/seedsplit.py
index 28ae7dd2..49704d11 100755
--- a/test/cmdtest_d/ct_seedsplit.py
+++ b/test/cmdtest_d/seedsplit.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_d.ct_seedsplit: Seed split/join tests for the cmdtest.py test suite
+test.cmdtest_d.seedsplit: Seed split/join tests for the cmdtest.py test suite
 """
 
 import os
@@ -26,8 +26,8 @@ from mmgen.wallet import get_wallet_cls
 from mmgen.util import capfirst
 
 from ..include.common import strip_ansi_escapes, cmp_or_die
-from .common import get_file_with_ext
-from .ct_base import CmdTestBase
+from .include.common import get_file_with_ext
+from .base import CmdTestBase
 
 ref_wf = 'test/ref/98831F3A.bip39'
 ref_sid = '98831F3A'
diff --git a/test/cmdtest_d/ct_shared.py b/test/cmdtest_d/shared.py
similarity index 98%
rename from test/cmdtest_d/ct_shared.py
rename to test/cmdtest_d/shared.py
index 49e502ad..8475bbf0 100755
--- a/test/cmdtest_d/ct_shared.py
+++ b/test/cmdtest_d/shared.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_d.ct_shared: Shared methods for the cmdtest.py test suite
+test.cmdtest_d.shared: Shared methods for the cmdtest.py test suite
 """
 
 from mmgen.util import get_extension
@@ -26,7 +26,7 @@ from mmgen.addrlist import AddrList
 from mmgen.passwdlist import PasswordList
 
 from ..include.common import cfg, cmp_or_die, strip_ansi_escapes, joinpath, silence, end_silence
-from .common import ref_bw_file, ref_bw_hash_preset, ref_dir
+from .include.common import ref_bw_file, ref_bw_hash_preset, ref_dir
 
 class CmdTestShared:
 	'shared methods for the cmdtest.py test suite'
diff --git a/test/cmdtest_d/ct_swap.py b/test/cmdtest_d/swap.py
similarity index 99%
rename from test/cmdtest_d/ct_swap.py
rename to test/cmdtest_d/swap.py
index 884dfde5..71cb7bd6 100755
--- a/test/cmdtest_d/ct_swap.py
+++ b/test/cmdtest_d/swap.py
@@ -9,18 +9,18 @@
 #   https://gitlab.com/mmgen/mmgen-wallet
 
 """
-test.cmdtest_d.ct_swap: asset swap tests for the cmdtest.py test suite
+test.cmdtest_d.swap: asset swap tests for the cmdtest.py test suite
 """
 
 from pathlib import Path
 
 from mmgen.protocol import init_proto
 from ..include.common import make_burn_addr, gr_uc
-from .common import dfl_bip39_file
+from .include.common import dfl_bip39_file
 from .httpd.thornode import ThornodeServer
 
-from .ct_autosign import CmdTestAutosign, CmdTestAutosignThreaded
-from .ct_regtest import CmdTestRegtest, rt_data, dfl_wcls, rt_pw, strip_ansi_escapes
+from .autosign import CmdTestAutosign, CmdTestAutosignThreaded
+from .regtest import CmdTestRegtest, rt_data, dfl_wcls, rt_pw, strip_ansi_escapes
 
 thornode_server = ThornodeServer()
 
diff --git a/test/cmdtest_d/ct_tool.py b/test/cmdtest_d/tool.py
similarity index 95%
rename from test/cmdtest_d/ct_tool.py
rename to test/cmdtest_d/tool.py
index 8dec9e7f..82c70494 100755
--- a/test/cmdtest_d/ct_tool.py
+++ b/test/cmdtest_d/tool.py
@@ -7,7 +7,7 @@
 # Licensed according to the terms of GPL Version 3.  See LICENSE for details.
 
 """
-test.cmdtest_d.ct_tool: tool tests for the MMGen cmdtest.py test suite
+test.cmdtest_d.tool: tool tests for the MMGen cmdtest.py test suite
 """
 
 import sys, os
@@ -23,9 +23,9 @@ from ..include.common import (
 	joinpath,
 	getrand
 )
-from .common import hincog_fn, incog_id_fn, hincog_offset, tool_enc_passwd, ref_dir
-from .ct_base import CmdTestBase
-from .ct_main import CmdTestMain
+from .include.common import hincog_fn, incog_id_fn, hincog_offset, tool_enc_passwd, ref_dir
+from .base import CmdTestBase
+from .main import CmdTestMain
 
 class CmdTestTool(CmdTestMain, CmdTestBase):
 	"interactive 'mmgen-tool' commands"
diff --git a/test/cmdtest_d/ct_wallet.py b/test/cmdtest_d/wallet.py
similarity index 97%
rename from test/cmdtest_d/ct_wallet.py
rename to test/cmdtest_d/wallet.py
index 5d0ff567..ca2a63b9 100755
--- a/test/cmdtest_d/ct_wallet.py
+++ b/test/cmdtest_d/wallet.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_d.ct_wallet: Wallet conversion tests for the cmdtest.py test suite
+test.cmdtest_d.wallet: Wallet conversion tests for the cmdtest.py test suite
 """
 
 import sys, os
@@ -26,9 +26,9 @@ from mmgen.util import msg, capfirst, get_extension
 from mmgen.wallet import get_wallet_cls
 
 from ..include.common import joinpath, VirtBlockDevice
-from .common import ref_dir, ref_wallet_brainpass, ref_wallet_incog_offset, hincog_fn, hincog_bytes
-from .ct_base import CmdTestBase
-from .ct_shared import CmdTestShared
+from .include.common import ref_dir, ref_wallet_brainpass, ref_wallet_incog_offset, hincog_fn, hincog_bytes
+from .base import CmdTestBase
+from .shared import CmdTestShared
 
 class CmdTestWalletConv(CmdTestBase, CmdTestShared):
 	'wallet conversion to and from reference data'
diff --git a/test/cmdtest_d/ct_xmr_autosign.py b/test/cmdtest_d/xmr_autosign.py
similarity index 98%
rename from test/cmdtest_d/ct_xmr_autosign.py
rename to test/cmdtest_d/xmr_autosign.py
index 74a94a66..b9e13799 100755
--- a/test/cmdtest_d/ct_xmr_autosign.py
+++ b/test/cmdtest_d/xmr_autosign.py
@@ -10,7 +10,7 @@
 
 
 """
-test.cmdtest_d.ct_xmr_autosign: xmr autosigning tests for the cmdtest.py test suite
+test.cmdtest_d.xmr_autosign: xmr autosigning tests for the cmdtest.py test suite
 """
 
 import re
@@ -19,10 +19,10 @@ from mmgen.color import blue, cyan, brown
 from mmgen.util import async_run
 
 from ..include.common import imsg, silence, end_silence
-from .common import get_file_with_ext
+from .include.common import get_file_with_ext
 
-from .ct_xmrwallet import CmdTestXMRWallet
-from .ct_autosign import CmdTestAutosignThreaded
+from .xmrwallet import CmdTestXMRWallet
+from .autosign import CmdTestAutosignThreaded
 
 def make_burn_addr(cfg):
 	from mmgen.tool.coin import tool_cmd
@@ -38,7 +38,7 @@ class CmdTestXMRAutosign(CmdTestXMRWallet, CmdTestAutosignThreaded):
 	"""
 	tmpdir_nums = [39]
 
-	# ct_xmrwallet attrs:
+	# xmrwallet attrs:
 	tx_relay_user = 'miner'
 	#    user     sid      autosign  shift kal_range add_coind_args
 	user_data = (
@@ -46,7 +46,7 @@ class CmdTestXMRAutosign(CmdTestXMRWallet, CmdTestAutosignThreaded):
 		('alice', 'FE3C6545', True,  150, '1-2', []),
 	)
 
-	# ct_autosign attrs:
+	# autosign attrs:
 	coins = ['xmr']
 
 	cmd_group = (
diff --git a/test/cmdtest_d/ct_xmrwallet.py b/test/cmdtest_d/xmrwallet.py
similarity index 99%
rename from test/cmdtest_d/ct_xmrwallet.py
rename to test/cmdtest_d/xmrwallet.py
index 89096617..366dafb5 100755
--- a/test/cmdtest_d/ct_xmrwallet.py
+++ b/test/cmdtest_d/xmrwallet.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_d.ct_xmrwallet: xmrwallet tests for the cmdtest.py test suite
+test.cmdtest_d.xmrwallet: xmrwallet tests for the cmdtest.py test suite
 """
 
 import sys, os, time, re, atexit, asyncio, shutil
@@ -42,8 +42,8 @@ from ..include.common import (
 	end_silence,
 	strip_ansi_escapes
 )
-from .common import get_file_with_ext
-from .ct_base import CmdTestBase
+from .include.common import get_file_with_ext
+from .base import CmdTestBase
 
 # atexit functions:
 def stop_daemons(self):
diff --git a/test/include/cfg.py b/test/include/cfg.py
index e579ae72..114c874b 100755
--- a/test/include/cfg.py
+++ b/test/include/cfg.py
@@ -12,4 +12,4 @@
 test.include.cfg: Configuration for test scripts
 """
 
-from ..cmdtest_d.cfg import cfgs as clean_cfgs
+from ..cmdtest_d.include.cfg import cfgs as clean_cfgs
diff --git a/test/modtest_d/testdep.py b/test/modtest_d/testdep.py
index efb9f207..796e4f36 100755
--- a/test/modtest_d/testdep.py
+++ b/test/modtest_d/testdep.py
@@ -65,5 +65,5 @@ class unit_tests:
 		return True
 
 	def ssh_socks_proxy(self, name, ut):
-		from test.cmdtest_d.ct_xmrwallet import CmdTestXMRWallet
+		from test.cmdtest_d.xmrwallet import CmdTestXMRWallet
 		return CmdTestXMRWallet.init_proxy(cfg, external_call=True)
diff --git a/test/test-release.d/cfg.sh b/test/test-release.d/cfg.sh
index 5a2f4211..99d9e997 100755
--- a/test/test-release.d/cfg.sh
+++ b/test/test-release.d/cfg.sh
@@ -90,7 +90,7 @@ init_tests() {
 		b $pylint $PYLINT_OPTS --disable=relative-beyond-top-level test/cmdtest_d
 		a $pylint $PYLINT_OPTS --ignore-paths '.*/eth/.*' mmgen
 		a $pylint $PYLINT_OPTS --ignore-paths '.*/dep.py,.*/testdep.py' test
-		a $pylint $PYLINT_OPTS --ignore-paths '.*/ct_ethdev.py' --disable=relative-beyond-top-level test/cmdtest_d
+		a $pylint $PYLINT_OPTS --ignore-paths '.*/ethdev.py' --disable=relative-beyond-top-level test/cmdtest_d
 		- $pylint $PYLINT_OPTS examples
 	"