diff --git a/myhdl/test/perf_inferWaiter.py b/myhdl/test/core/perf_inferWaiter.py
similarity index 100%
rename from myhdl/test/perf_inferWaiter.py
rename to myhdl/test/core/perf_inferWaiter.py
diff --git a/myhdl/test/test_Cosimulation.py b/myhdl/test/core/test_Cosimulation.py
similarity index 100%
rename from myhdl/test/test_Cosimulation.py
rename to myhdl/test/core/test_Cosimulation.py
diff --git a/myhdl/test/test_Signal.py b/myhdl/test/core/test_Signal.py
similarity index 100%
rename from myhdl/test/test_Signal.py
rename to myhdl/test/core/test_Signal.py
diff --git a/myhdl/test/test_Simulation.py b/myhdl/test/core/test_Simulation.py
similarity index 100%
rename from myhdl/test/test_Simulation.py
rename to myhdl/test/core/test_Simulation.py
diff --git a/myhdl/test/test_all.py b/myhdl/test/core/test_all.py
similarity index 100%
rename from myhdl/test/test_all.py
rename to myhdl/test/core/test_all.py
diff --git a/myhdl/test/test_always.py b/myhdl/test/core/test_always.py
similarity index 100%
rename from myhdl/test/test_always.py
rename to myhdl/test/core/test_always.py
diff --git a/myhdl/test/test_always_comb.py b/myhdl/test/core/test_always_comb.py
similarity index 100%
rename from myhdl/test/test_always_comb.py
rename to myhdl/test/core/test_always_comb.py
diff --git a/myhdl/test/test_bin.py b/myhdl/test/core/test_bin.py
similarity index 100%
rename from myhdl/test/test_bin.py
rename to myhdl/test/core/test_bin.py
diff --git a/myhdl/test/test_concat.py b/myhdl/test/core/test_concat.py
similarity index 100%
rename from myhdl/test/test_concat.py
rename to myhdl/test/core/test_concat.py
diff --git a/myhdl/test/test_enum.py b/myhdl/test/core/test_enum.py
similarity index 100%
rename from myhdl/test/test_enum.py
rename to myhdl/test/core/test_enum.py
diff --git a/myhdl/test/test_inferWaiter.py b/myhdl/test/core/test_inferWaiter.py
similarity index 100%
rename from myhdl/test/test_inferWaiter.py
rename to myhdl/test/core/test_inferWaiter.py
diff --git a/myhdl/test/test_instance.py b/myhdl/test/core/test_instance.py
similarity index 100%
rename from myhdl/test/test_instance.py
rename to myhdl/test/core/test_instance.py
diff --git a/myhdl/test/test_intbv.py b/myhdl/test/core/test_intbv.py
similarity index 100%
rename from myhdl/test/test_intbv.py
rename to myhdl/test/core/test_intbv.py
diff --git a/myhdl/test/test_misc.py b/myhdl/test/core/test_misc.py
similarity index 100%
rename from myhdl/test/test_misc.py
rename to myhdl/test/core/test_misc.py
diff --git a/myhdl/test/test_traceSignals.py b/myhdl/test/core/test_traceSignals.py
similarity index 100%
rename from myhdl/test/test_traceSignals.py
rename to myhdl/test/core/test_traceSignals.py
diff --git a/myhdl/test/test_unparse.py b/myhdl/test/core/test_unparse.py
similarity index 100%
rename from myhdl/test/test_unparse.py
rename to myhdl/test/core/test_unparse.py