diff --git a/imperative/python/test/unit/test_zero_dim_tensor.py b/imperative/python/test/unit/core/test_zero_dim_tensor.py
similarity index 100%
rename from imperative/python/test/unit/test_zero_dim_tensor.py
rename to imperative/python/test/unit/core/test_zero_dim_tensor.py
diff --git a/imperative/python/test/unit/test_tracing.py b/imperative/python/test/unit/jit/test_tracing.py
similarity index 99%
rename from imperative/python/test/unit/test_tracing.py
rename to imperative/python/test/unit/jit/test_tracing.py
index 58f07207334be6da0d65a1d7f34b4db65811a825..1669899f034e0ec9b1cf0a3708419e22c90d870d 100644
--- a/imperative/python/test/unit/test_tracing.py
+++ b/imperative/python/test/unit/jit/test_tracing.py
@@ -28,6 +28,7 @@ from megengine.functional import exp, log
 from megengine.jit import exclude_from_trace, trace
 from megengine.module import Module
 from megengine.random import normal, uniform
+from megengine.utils.naming import auto_naming
 
 
 @pytest.mark.parametrize("trace_mode", [False, True])
@@ -139,6 +140,8 @@ def test_dump():
     def f(a, b):
         return a + b
 
+    # prevent from remaining scope from exception test
+    auto_naming.clear()
     a = tensor([2])
     b = tensor([4])
     y = f(a, b).numpy()
diff --git a/imperative/python/test/unit/test_cgtools.py b/imperative/python/test/unit/utils/test_cgtools.py
similarity index 100%
rename from imperative/python/test/unit/test_cgtools.py
rename to imperative/python/test/unit/utils/test_cgtools.py
diff --git a/imperative/python/test/unit/test_dump_naming.py b/imperative/python/test/unit/utils/test_dump_naming.py
similarity index 100%
rename from imperative/python/test/unit/test_dump_naming.py
rename to imperative/python/test/unit/utils/test_dump_naming.py
diff --git a/imperative/python/test/unit/utils/test_opr.py b/imperative/python/test/unit/utils/test_network_node.py
similarity index 100%
rename from imperative/python/test/unit/utils/test_opr.py
rename to imperative/python/test/unit/utils/test_network_node.py
diff --git a/imperative/python/test/unit/test_utils.py b/imperative/python/test/unit/utils/test_utils.py
similarity index 100%
rename from imperative/python/test/unit/test_utils.py
rename to imperative/python/test/unit/utils/test_utils.py