diff --git a/cmd/cgr-engine/rater.go b/cmd/cgr-engine/rater.go
index 5e83624c4..1e98a6ede 100755
--- a/cmd/cgr-engine/rater.go
+++ b/cmd/cgr-engine/rater.go
@@ -191,8 +191,9 @@ func startRater(internalRaterChan, internalApierv1, internalApierv2 chan rpcclie
 	if !cfg.DispatcherSCfg().Enabled {
 		server.RpcRegister(responder)
 	}
-	server.RpcRegister(apierRpcV1) // ToDo: Add apierv1 to dispatcher
-	server.RpcRegister(apierRpcV2) // ToDo: Add apierv2 to dispatcher
+	// ToDo: do not register when dispatcher is active
+	server.RpcRegister(apierRpcV1)
+	server.RpcRegister(apierRpcV2)
 
 	utils.RegisterRpcParams("", &v1.CDRsV1{})
 	utils.RegisterRpcParams("", &v2.CDRsV2{})
diff --git a/dispatchers/cdrs_it_test.go b/dispatchers/cdrs_it_test.go
index 9e1692c21..e382fc930 100644
--- a/dispatchers/cdrs_it_test.go
+++ b/dispatchers/cdrs_it_test.go
@@ -32,11 +32,11 @@ var sTestsDspCDRs = []func(t *testing.T){
 
 //Test start here
 func TestDspCDRsITMySQL(t *testing.T) {
-	testDsp(t, sTestsDspCDRs, "TestDspCDRs", "all", "all2", "attributes", "dispatchers", "tutorial", "oldtutorial", "dispatchers")
+	testDsp(t, sTestsDspCDRs, "TestDspCDRs", "all", "all2", "dispatchers", "tutorial", "oldtutorial", "dispatchers")
 }
 
 func TestDspCDRsITMongo(t *testing.T) {
-	testDsp(t, sTestsDspCDRs, "TestDspCDRs", "all", "all2", "attributes_mongo", "dispatchers_mongo", "tutorial", "oldtutorial", "dispatchers")
+	testDsp(t, sTestsDspCDRs, "TestDspCDRs", "all", "all2", "dispatchers_mongo", "tutorial", "oldtutorial", "dispatchers")
 }
 
 func testDspCDRsPing(t *testing.T) {