diff --git a/agents/radagent_handlr_it_test.go b/agents/radagent_handlr_it_test.go
index 3f100a4b2..168fe8c89 100644
--- a/agents/radagent_handlr_it_test.go
+++ b/agents/radagent_handlr_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/ers/flatstore_it_test.go b/ers/flatstore_it_test.go
index 9666683db..15cba102b 100644
--- a/ers/flatstore_it_test.go
+++ b/ers/flatstore_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/ers/partial_csv_it_test.go b/ers/partial_csv_it_test.go
index ef8481d54..0b0fc837c 100644
--- a/ers/partial_csv_it_test.go
+++ b/ers/partial_csv_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/ers/sql_it_test.go b/ers/sql_it_test.go
index 35efa12f3..14499ce21 100644
--- a/ers/sql_it_test.go
+++ b/ers/sql_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/destination_combined_it_test.go b/general_tests/destination_combined_it_test.go
index d2b4b32da..ee3d5b018 100644
--- a/general_tests/destination_combined_it_test.go
+++ b/general_tests/destination_combined_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/gocs_it_test.go b/general_tests/gocs_it_test.go
index 1a37d21a3..b061f4f68 100644
--- a/general_tests/gocs_it_test.go
+++ b/general_tests/gocs_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_rounding2_it_test.go b/general_tests/session_rounding2_it_test.go
index e0fe85d01..4b75e8376 100644
--- a/general_tests/session_rounding2_it_test.go
+++ b/general_tests/session_rounding2_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