diff --git a/.buildkite/scripts/test.ps1 b/.buildkite/scripts/test.ps1
index f4046f95..f786ac4f 100755
--- a/.buildkite/scripts/test.ps1
+++ b/.buildkite/scripts/test.ps1
@@ -21,7 +21,7 @@ Write-Host "--- Run test"
 $ErrorActionPreference = "Continue" # set +e
 mkdir -p build
 $OUT_FILE="output-report.out"
-go test "./..." -v > $OUT_FILE
+go test -tags integration "./..." -v > $OUT_FILE
 $EXITCODE=$LASTEXITCODE
 $ErrorActionPreference = "Stop"
 
diff --git a/.buildkite/scripts/test.sh b/.buildkite/scripts/test.sh
index c3a5a443..1993f920 100755
--- a/.buildkite/scripts/test.sh
+++ b/.buildkite/scripts/test.sh
@@ -11,7 +11,7 @@ with_go_junit_report
 
 echo "--- Go Test"
 set +e
-go test -race -v ./... > tests-report.txt
+go test -tags integration -race -v ./... > tests-report.txt
 exit_code=$?
 set -e
 
diff --git a/file/helper_test.go b/file/helper_test.go
index 01cbb363..f644d47b 100644
--- a/file/helper_test.go
+++ b/file/helper_test.go
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-//go:build !integration
-
 package file
 
 import (
diff --git a/kibana/url_test.go b/kibana/url_test.go
index 8849fc81..48b0cca8 100644
--- a/kibana/url_test.go
+++ b/kibana/url_test.go
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-//go:build !integration
-
 package kibana
 
 import (
diff --git a/logp/core_linux_test.go b/logp/core_linux_test.go
index c18c03eb..f31c8633 100644
--- a/logp/core_linux_test.go
+++ b/logp/core_linux_test.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-//go:build linux
+//go:build linux && integration
 
 package logp
 
diff --git a/mapstr/mapstr_test.go b/mapstr/mapstr_test.go
index 8fbbf5d0..5f054b75 100644
--- a/mapstr/mapstr_test.go
+++ b/mapstr/mapstr_test.go
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-//go:build !integration
-
 package mapstr
 
 import (
diff --git a/monitoring/opts_test.go b/monitoring/opts_test.go
index 46bdddf4..ddbd21b0 100644
--- a/monitoring/opts_test.go
+++ b/monitoring/opts_test.go
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-//go:build !integration
-
 package monitoring
 
 import (
diff --git a/monitoring/registry_test.go b/monitoring/registry_test.go
index c9fdeca3..6d80df07 100644
--- a/monitoring/registry_test.go
+++ b/monitoring/registry_test.go
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-//go:build !integration
-
 package monitoring
 
 import (
diff --git a/monitoring/visitor_expvar_test.go b/monitoring/visitor_expvar_test.go
index 5624656e..be4a35cf 100644
--- a/monitoring/visitor_expvar_test.go
+++ b/monitoring/visitor_expvar_test.go
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-//go:build !integration
-
 package monitoring
 
 import (
diff --git a/transform/typeconv/datetime_test.go b/transform/typeconv/datetime_test.go
index baaf410d..1bc0073b 100644
--- a/transform/typeconv/datetime_test.go
+++ b/transform/typeconv/datetime_test.go
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-//go:build !integration
-
 package typeconv
 
 import (
diff --git a/transport/tlscommon/tls_test.go b/transport/tlscommon/tls_test.go
index 0de8872b..a6c31253 100644
--- a/transport/tlscommon/tls_test.go
+++ b/transport/tlscommon/tls_test.go
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-//go:build !integration
-
 package tlscommon
 
 import (