diff --git a/dnn/test/common/opr_trait.h b/dnn/src/common/opr_trait.h
similarity index 97%
rename from dnn/test/common/opr_trait.h
rename to dnn/src/common/opr_trait.h
index 08929d3de86f61cfbce1c1d1879f9697f5ced7ac..4088c0510f0c2dcc37e2915313d2196200ebd0e4 100644
--- a/dnn/test/common/opr_trait.h
+++ b/dnn/src/common/opr_trait.h
@@ -1,5 +1,5 @@
 /**
- * \file dnn/test/common/opr_trait.h
+ * \file dnn/src/common/opr_trait.h
  * MegEngine is Licensed under the Apache License, Version 2.0 (the "License")
  *
  * Copyright (c) 2014-2021 Megvii Inc. All rights reserved.
@@ -14,7 +14,6 @@
 #include <cstddef>
 
 namespace megdnn {
-namespace test {
 
 template <typename Opr>
 struct OprTrait {};
@@ -114,7 +113,10 @@ DEF(FakeQuantForward, 4, true, true);
 DEF(FakeQuantBackward, 5, true, false);
 DEF(TQTForward, 3, true, true);
 DEF(TQTBackward, 5, true, false);
-}  // namespace test
+DEF(PowC, 2, false, true);
+DEF(UniformRNG, 1, true, true);
+DEF(GaussianRNG, 1, true, true);
+
 }  // namespace megdnn
 
 // vim: syntax=cpp.doxygen
diff --git a/dnn/test/common/opr_algo_proxy.h b/dnn/test/common/opr_algo_proxy.h
index 5ad9fbcd7633b7f26766132ecba322ca9b4ab7d3..79361f07e5005766e280e31dfccfc29f1736e841 100644
--- a/dnn/test/common/opr_algo_proxy.h
+++ b/dnn/test/common/opr_algo_proxy.h
@@ -12,7 +12,7 @@
 #pragma once
 
 #include "megdnn/basic_types.h"
-#include "test/common/opr_trait.h"
+#include "src/common/opr_trait.h"
 #include "test/common/utils.h"
 
 namespace megdnn {
diff --git a/dnn/test/common/opr_proxy.h b/dnn/test/common/opr_proxy.h
index 8ca2f68dc653638d5358d2b3d8a236db61483699..0f5a89a0e06d73d85d7fc3f10ac850001af76a89 100644
--- a/dnn/test/common/opr_proxy.h
+++ b/dnn/test/common/opr_proxy.h
@@ -11,12 +11,13 @@
  */
 #pragma once
 
+#include "src/common/opr_trait.h"
+
 #include "test/common/deduce_layout_proxy.h"
 #include "test/common/exec_proxy.h"
 #include "test/common/fast_run_cache.h"
 #include "test/common/inspect_type.h"
 #include "test/common/opr_algo_proxy.h"
-#include "test/common/opr_trait.h"
 #include "test/common/timer.h"
 #include "test/common/workspace_wrapper.h"
 
diff --git a/dnn/test/common/powc.h b/dnn/test/common/powc.h
index 241697f5c3a11af0c5488a89f2c7cbf9d9e05908..44cf091bc1d7dc41afaa4a0dc14c6fa2365579e4 100644
--- a/dnn/test/common/powc.h
+++ b/dnn/test/common/powc.h
@@ -12,13 +12,12 @@
 
 #include "megdnn/handle.h"
 #include "megdnn/oprs/general.h"
-#include "test/common/opr_proxy.h"
+
+#include "src/common/opr_trait.h"
 
 namespace megdnn {
 namespace test {
 
-DEF(PowC, 2, false, true);
-
 void run_powc_test(Handle* handle, DType dtype);
 
 }  // namespace test