diff --git a/test/eqc/gmt_eqc_gen_eqc_tests.erl b/test/eqc/gmt_eqc_gen_eqc_tests.erl
index fa0caeb..99f0c3c 100644
--- a/test/eqc/gmt_eqc_gen_eqc_tests.erl
+++ b/test/eqc/gmt_eqc_gen_eqc_tests.erl
@@ -28,14 +28,13 @@
 
 %% run from eunit
 eunit_test_() ->
-    erlang:group_leader(whereis(user), self()),
-    {timeout, 60, [fun() -> [] = run() end]}.
+    gmt_eqc:eunit_module(?MODULE, 3000).
 
 run() ->
     run(3000).
 
-run(Num) ->
-    eqc:module({numtests,Num}, ?MODULE).
+run(NumTests) ->
+    eqc:module({numtests,NumTests}, ?MODULE).
 
 %% @desc test the any generator against the ubf encoder/decoder
 prop_ubf_gen_any() ->
diff --git a/src/gmt_eqc_ubf.erl b/test/eqc/gmt_eqc_ubf.erl
similarity index 100%
rename from src/gmt_eqc_ubf.erl
rename to test/eqc/gmt_eqc_ubf.erl
diff --git a/src/gmt_eqc_ubf_types.erl b/test/eqc/gmt_eqc_ubf_types.erl
similarity index 100%
rename from src/gmt_eqc_ubf_types.erl
rename to test/eqc/gmt_eqc_ubf_types.erl