diff --git a/benchmark_test.go b/benchmark_test.go
index beef6cb..672b04d 100644
--- a/benchmark_test.go
+++ b/benchmark_test.go
@@ -1,6 +1,3 @@
-//go:build norace
-// +build norace
-
 package unleash_test
 
 import (
diff --git a/example_bootstrap_from_file_test.go b/example_bootstrap_from_file_test.go
index ff2909e..0c1eadf 100644
--- a/example_bootstrap_from_file_test.go
+++ b/example_bootstrap_from_file_test.go
@@ -1,6 +1,3 @@
-//go:build norace
-// +build norace
-
 package unleash_test
 
 import (
diff --git a/example_custom_strategy_test.go b/example_custom_strategy_test.go
index f0bb01d..c0968e1 100644
--- a/example_custom_strategy_test.go
+++ b/example_custom_strategy_test.go
@@ -1,15 +1,11 @@
-//go:build norace
-// +build norace
-
 package unleash_test
 
 import (
 	"fmt"
-	"strings"
-	"time"
-
 	"github.com/Unleash/unleash-client-go/v4"
 	"github.com/Unleash/unleash-client-go/v4/context"
+	"strings"
+	"time"
 )
 
 type ActiveForUserWithEmailStrategy struct{}
diff --git a/example_fallback_func_test.go b/example_fallback_func_test.go
index 5e8f3c1..7c47bba 100644
--- a/example_fallback_func_test.go
+++ b/example_fallback_func_test.go
@@ -1,14 +1,10 @@
-//go:build norace
-// +build norace
-
 package unleash_test
 
 import (
 	"fmt"
-	"time"
-
 	"github.com/Unleash/unleash-client-go/v4"
 	"github.com/Unleash/unleash-client-go/v4/context"
+	"time"
 )
 
 const MissingFeature = "does_not_exist"
diff --git a/example_simple_usage_test.go b/example_simple_usage_test.go
index 06a65ed..9240897 100644
--- a/example_simple_usage_test.go
+++ b/example_simple_usage_test.go
@@ -1,13 +1,9 @@
-//go:build norace
-// +build norace
-
 package unleash_test
 
 import (
 	"fmt"
-	"time"
-
 	"github.com/Unleash/unleash-client-go/v4"
+	"time"
 )
 
 const PropertyName = "eid.enabled"
diff --git a/example_with_instance_test.go b/example_with_instance_test.go
index b9789d7..b75be77 100644
--- a/example_with_instance_test.go
+++ b/example_with_instance_test.go
@@ -1,13 +1,9 @@
-//go:build norace
-// +build norace
-
 package unleash_test
 
 import (
 	"fmt"
-	"time"
-
 	"github.com/Unleash/unleash-client-go/v4"
+	"time"
 )
 
 // Sync runs the client event loop. All of the channels must be read to avoid blocking the
diff --git a/metrics_test.go b/metrics_test.go
index d2e3c4b..5e38c02 100644
--- a/metrics_test.go
+++ b/metrics_test.go
@@ -1,6 +1,3 @@
-//go:build norace
-// +build norace
-
 package unleash
 
 import (
diff --git a/repository_test.go b/repository_test.go
index e32ef08..dcdbaeb 100644
--- a/repository_test.go
+++ b/repository_test.go
@@ -1,6 +1,3 @@
-//go:build norace
-// +build norace
-
 package unleash
 
 import (
diff --git a/unleash_test.go b/unleash_test.go
index cd02cc2..145cfab 100644
--- a/unleash_test.go
+++ b/unleash_test.go
@@ -1,6 +1,3 @@
-//go:build norace
-// +build norace
-
 package unleash_test
 
 import (
diff --git a/utils_test.go b/utils_test.go
index 9a31717..204269b 100644
--- a/utils_test.go
+++ b/utils_test.go
@@ -1,6 +1,3 @@
-//go:build norace
-// +build norace
-
 package unleash
 
 import (
@@ -119,3 +116,4 @@ func TestContains(t *testing.T) {
 		}
 	})
 }
+