diff --git a/apier/v1/filter_indexes_it_test.go b/apier/v1/filter_indexes_it_test.go
index 5adcdfec2..a19bf0d79 100644
--- a/apier/v1/filter_indexes_it_test.go
+++ b/apier/v1/filter_indexes_it_test.go
@@ -1812,7 +1812,7 @@ func testV1FISetRateProfileRatesIndexes(t *testing.T) {
 	//there are not any rates in db
 	var reply *engine.RateProfile
 	if err := tFIdxRpc.Call(utils.APIerSv1GetRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP1"}}, &reply); err == nil ||
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP1"}}, &reply); err == nil ||
 		err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
diff --git a/dispatchers/dispatchers_it_test.go b/dispatchers/dispatchers_it_test.go
index 72e9154fd..837ac6552 100644
--- a/dispatchers/dispatchers_it_test.go
+++ b/dispatchers/dispatchers_it_test.go
@@ -106,7 +106,7 @@ func testDspApierGetAttributes(t *testing.T) {
 	}
 	alsPrf.Compile()
 	if err := dispEngine.RPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{
+		utils.TenantIDWithAPIOpts{
 			TenantID:      &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_Dispatcher"},
 			ArgDispatcher: &utils.ArgDispatcher{APIKey: utils.StringPointer("apier12345")},
 		}, &reply); err != nil {
@@ -122,7 +122,7 @@ func testDspApierGetAttributes(t *testing.T) {
 func testDspApierUnkownAPiKey(t *testing.T) {
 	var reply *engine.AttributeProfile
 	if err := dispEngine.RPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{
+		utils.TenantIDWithAPIOpts{
 			TenantID:      &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_Dispatcher"},
 			ArgDispatcher: &utils.ArgDispatcher{APIKey: utils.StringPointer("RandomApiKey")},
 		}, &reply); err == nil || err.Error() != utils.ErrUnknownApiKey.Error() {