diff --git a/dispatchers/responder_it_test.go b/dispatchers/responder_it_test.go
index 1a0cd31ea..880fa1386 100644
--- a/dispatchers/responder_it_test.go
+++ b/dispatchers/responder_it_test.go
@@ -1,5 +1,4 @@
-//go:build integration
-// +build integration
+//go:build flaky
 
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
diff --git a/ees/poster_it_test.go b/ees/poster_it_test.go
index 7927a7076..a66b0bffa 100644
--- a/ees/poster_it_test.go
+++ b/ees/poster_it_test.go
@@ -1,5 +1,4 @@
-//go:build integration
-// +build integration
+//go:build flaky
 
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
diff --git a/engine/z_versions_it_test.go b/engine/z_versions_it_test.go
index 733389278..ba0147775 100644
--- a/engine/z_versions_it_test.go
+++ b/engine/z_versions_it_test.go
@@ -1,5 +1,4 @@
-//go:build integration
-// +build integration
+//go:build flaky
 
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
@@ -125,7 +124,7 @@ func testVersionsFlush(t *testing.T) {
 	if err != nil {
 		t.Error("Error when flushing Mongo ", err.Error())
 	}
-	if err := storageDb.Flush(path.Join(versionCfg.DataFolderPath, "storage", dbPath(versionCfg.StorDbCfg().Type))); err != nil {
+	if err := storageDb.Flush(path.Join(versionCfg.DataFolderPath, "storage", strings.Trim(versionCfg.StorDbCfg().Type, "*"))); err != nil {
 		t.Error(err)
 	}
 	SetDBVersions(storageDb)
diff --git a/general_tests/all_cfg_sect_rld_it_test.go b/general_tests/all_cfg_sect_rld_it_test.go
index e4bdb2f3e..660b84d60 100644
--- a/general_tests/all_cfg_sect_rld_it_test.go
+++ b/general_tests/all_cfg_sect_rld_it_test.go
@@ -1,5 +1,4 @@
-//go:build integration
-// +build integration
+//go:build flaky
 
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
diff --git a/general_tests/cdrs_exp_it_test.go b/general_tests/cdrs_exp_it_test.go
index 4119e2148..4eba4a660 100644
--- a/general_tests/cdrs_exp_it_test.go
+++ b/general_tests/cdrs_exp_it_test.go
@@ -1,4 +1,4 @@
-//go:build integration
+//go:build flaky
 
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
diff --git a/general_tests/cdrs_onlexp_it_test.go b/general_tests/cdrs_onlexp_it_test.go
index 0806383b5..58c1d897e 100644
--- a/general_tests/cdrs_onlexp_it_test.go
+++ b/general_tests/cdrs_onlexp_it_test.go
@@ -1,5 +1,4 @@
-//go:build integration
-// +build integration
+//go:build flaky
 
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
diff --git a/general_tests/filtered_replication_it_test.go b/general_tests/filtered_replication_it_test.go
index 570f01bae..3b2fd4da6 100644
--- a/general_tests/filtered_replication_it_test.go
+++ b/general_tests/filtered_replication_it_test.go
@@ -1,5 +1,4 @@
-//go:build integration
-// +build integration
+//go:build flaky
 
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
diff --git a/general_tests/session_replications_automaticdebit_it_test.go b/general_tests/session_replications_automaticdebit_it_test.go
index 841995f84..e54852860 100644
--- a/general_tests/session_replications_automaticdebit_it_test.go
+++ b/general_tests/session_replications_automaticdebit_it_test.go
@@ -1,5 +1,4 @@
-//go:build integration
-// +build integration
+//go:build flaky
 
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
diff --git a/services/ers_it_test.go b/services/ers_it_test.go
index 64a14bd01..23fa03529 100644
--- a/services/ers_it_test.go
+++ b/services/ers_it_test.go
@@ -88,6 +88,7 @@ func TestEventReaderSReload(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Fatalf("Expecting OK ,received %s", reply)
 	}
+	time.Sleep(10 * time.Millisecond)
 	runtime.Gosched()
 	if !erS.IsRunning() {
 		t.Fatalf("Expected service to be running")
diff --git a/utils/stir_shaken_utils_it_test.go b/utils/stir_shaken_utils_it_test.go
index 71d21afe1..c26d07a67 100644
--- a/utils/stir_shaken_utils_it_test.go
+++ b/utils/stir_shaken_utils_it_test.go
@@ -1,5 +1,4 @@
-//go:build integration
-// +build integration
+//go:build flaky
 
 /*
 Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments