diff --git a/.github/workflows/changes.yml b/.github/workflows/changes.yml
index c68eec6109509..01919d4cb0b75 100644
--- a/.github/workflows/changes.yml
+++ b/.github/workflows/changes.yml
@@ -324,7 +324,7 @@ jobs:
 
       # creates a yaml file that contains the filters for each integration,
       # extracted from the output of the `vdev int ci-paths` command, which
-      # sources the paths from the scripts/integration/.../test.yaml files
+      # sources the paths from the tests/integration/.../config/test.yaml files
       - name: Create filter rules for integrations
         run: vdev int ci-paths > int_test_filters.yaml
 
diff --git a/src/nats.rs b/src/nats.rs
index d33eadafa1646..715078f966577 100644
--- a/src/nats.rs
+++ b/src/nats.rs
@@ -266,7 +266,7 @@ mod tests {
         parse_auth(
             r#"
             strategy = "credentials_file"
-            credentials_file.path = "tests/data/nats/nats.creds"
+            credentials_file.path = "tests/integration/nats/data/nats.creds"
         "#,
         )
         .unwrap();
diff --git a/src/sinks/gcp_chronicle/chronicle_unstructured.rs b/src/sinks/gcp_chronicle/chronicle_unstructured.rs
index 0262648c18483..399034f33ce54 100644
--- a/src/sinks/gcp_chronicle/chronicle_unstructured.rs
+++ b/src/sinks/gcp_chronicle/chronicle_unstructured.rs
@@ -718,10 +718,9 @@ mod integration_tests {
         trace_init();
 
         let log_type = random_string(10);
-        let (sink, healthcheck) =
-            config_build(&log_type, "/home/vector/scripts/integration/gcp/auth.json")
-                .await
-                .expect("Building sink failed");
+        let (sink, healthcheck) = config_build(&log_type, "tests/integration/gcp/config/auth.json")
+            .await
+            .expect("Building sink failed");
 
         healthcheck.await.expect("Health check failed");
 
@@ -749,11 +748,7 @@ mod integration_tests {
 
         let log_type = random_string(10);
         // Test with an auth file that doesnt match the public key sent to the dummy chronicle server.
-        let sink = config_build(
-            &log_type,
-            "/home/vector/scripts/integration/gcp/invalidauth.json",
-        )
-        .await;
+        let sink = config_build(&log_type, "tests/integration/gcp/config/invalidauth.json").await;
 
         assert!(sink.is_err())
     }
@@ -765,10 +760,9 @@ mod integration_tests {
         // The chronicle-emulator we are testing against is setup so a `log_type` of "INVALID"
         // will return a `400 BAD_REQUEST`.
         let log_type = "INVALID";
-        let (sink, healthcheck) =
-            config_build(log_type, "/home/vector/scripts/integration/gcp/auth.json")
-                .await
-                .expect("Building sink failed");
+        let (sink, healthcheck) = config_build(log_type, "tests/integration/gcp/config/auth.json")
+            .await
+            .expect("Building sink failed");
 
         healthcheck.await.expect("Health check failed");
 
diff --git a/src/sinks/nats/integration_tests.rs b/src/sinks/nats/integration_tests.rs
index 434020f812ebe..9e80223ca53db 100644
--- a/src/sinks/nats/integration_tests.rs
+++ b/src/sinks/nats/integration_tests.rs
@@ -252,7 +252,7 @@ async fn nats_tls_valid() {
     conf.tls = Some(TlsEnableableConfig {
         enabled: Some(true),
         options: TlsConfig {
-            ca_file: Some("tests/data/nats/rootCA.pem".into()),
+            ca_file: Some("tests/integration/nats/data/rootCA.pem".into()),
             ..Default::default()
         },
     });
@@ -293,9 +293,9 @@ async fn nats_tls_client_cert_valid() {
     conf.tls = Some(TlsEnableableConfig {
         enabled: Some(true),
         options: TlsConfig {
-            ca_file: Some("tests/data/nats/rootCA.pem".into()),
-            crt_file: Some("tests/data/nats/nats-client.pem".into()),
-            key_file: Some("tests/data/nats/nats-client.key".into()),
+            ca_file: Some("tests/integration/nats/data/rootCA.pem".into()),
+            crt_file: Some("tests/integration/nats/data/nats-client.pem".into()),
+            key_file: Some("tests/integration/nats/data/nats-client.key".into()),
             ..Default::default()
         },
     });
@@ -319,7 +319,7 @@ async fn nats_tls_client_cert_invalid() {
     conf.tls = Some(TlsEnableableConfig {
         enabled: Some(true),
         options: TlsConfig {
-            ca_file: Some("tests/data/nats/rootCA.pem".into()),
+            ca_file: Some("tests/integration/nats/data/rootCA.pem".into()),
             ..Default::default()
         },
     });
@@ -343,13 +343,13 @@ async fn nats_tls_jwt_auth_valid() {
     conf.tls = Some(TlsEnableableConfig {
         enabled: Some(true),
         options: TlsConfig {
-            ca_file: Some("tests/data/nats/rootCA.pem".into()),
+            ca_file: Some("tests/integration/nats/data/rootCA.pem".into()),
             ..Default::default()
         },
     });
     conf.auth = Some(NatsAuthConfig::CredentialsFile {
         credentials_file: NatsAuthCredentialsFile {
-            path: "tests/data/nats/nats.creds".into(),
+            path: "tests/integration/nats/data/nats.creds".into(),
         },
     });
 
@@ -372,13 +372,13 @@ async fn nats_tls_jwt_auth_invalid() {
     conf.tls = Some(TlsEnableableConfig {
         enabled: Some(true),
         options: TlsConfig {
-            ca_file: Some("tests/data/nats/rootCA.pem".into()),
+            ca_file: Some("tests/integration/nats/data/rootCA.pem".into()),
             ..Default::default()
         },
     });
     conf.auth = Some(NatsAuthConfig::CredentialsFile {
         credentials_file: NatsAuthCredentialsFile {
-            path: "tests/data/nats/nats-bad.creds".into(),
+            path: "tests/integration/nats/data/nats-bad.creds".into(),
         },
     });
 
diff --git a/src/sources/amqp.rs b/src/sources/amqp.rs
index 407351c00ed24..b9928606a7341 100644
--- a/src/sources/amqp.rs
+++ b/src/sources/amqp.rs
@@ -599,7 +599,7 @@ pub mod test {
     }
 }
 
-/// Integration tests use the docker compose files in `scripts/integration/docker-compose.amqp.yml`.
+/// Integration tests use the docker compose files in `tests/integration/docker-compose.amqp.yml`.
 #[cfg(feature = "amqp-integration-tests")]
 #[cfg(test)]
 mod integration_test {
diff --git a/src/sources/http_client/integration_tests.rs b/src/sources/http_client/integration_tests.rs
index f1f85863ec1c1..f493323708163 100644
--- a/src/sources/http_client/integration_tests.rs
+++ b/src/sources/http_client/integration_tests.rs
@@ -244,7 +244,7 @@ async fn tls_invalid_ca() {
         headers: HashMap::new(),
         method: HttpMethod::Get,
         tls: Some(TlsConfig {
-            ca_file: Some("tests/data/http-client/certs/invalid-ca-cert.pem".into()),
+            ca_file: Some("tests/integration/http-client/data/certs/invalid-ca-cert.pem".into()),
             ..Default::default()
         }),
         auth: None,
diff --git a/src/sources/logstash.rs b/src/sources/logstash.rs
index c605ae18f6ce5..057822a6dfa4f 100644
--- a/src/sources/logstash.rs
+++ b/src/sources/logstash.rs
@@ -966,8 +966,12 @@ mod integration_tests {
                 Some(TlsEnableableConfig {
                     enabled: Some(true),
                     options: TlsConfig {
-                        crt_file: Some("tests/data/host.docker.internal.crt".into()),
-                        key_file: Some("tests/data/host.docker.internal.key".into()),
+                        crt_file: Some(
+                            "tests/integration/shared/data/host.docker.internal.crt".into(),
+                        ),
+                        key_file: Some(
+                            "tests/integration/shared/data/host.docker.internal.key".into(),
+                        ),
                         ..Default::default()
                     },
                 }),
diff --git a/src/sources/nats/integration_tests.rs b/src/sources/nats/integration_tests.rs
index 8ffd6cabbc176..a3caa7e766c07 100644
--- a/src/sources/nats/integration_tests.rs
+++ b/src/sources/nats/integration_tests.rs
@@ -280,7 +280,7 @@ async fn nats_tls_valid() {
     conf.tls = Some(TlsEnableableConfig {
         enabled: Some(true),
         options: TlsConfig {
-            ca_file: Some("tests/data/nats/rootCA.pem".into()),
+            ca_file: Some("tests/integration/nats/data/rootCA.pem".into()),
             ..Default::default()
         },
     });
@@ -317,9 +317,9 @@ async fn nats_tls_client_cert_valid() {
     conf.tls = Some(TlsEnableableConfig {
         enabled: Some(true),
         options: TlsConfig {
-            ca_file: Some("tests/data/nats/rootCA.pem".into()),
-            crt_file: Some("tests/data/nats/nats-client.pem".into()),
-            key_file: Some("tests/data/nats/nats-client.key".into()),
+            ca_file: Some("tests/integration/nats/data/rootCA.pem".into()),
+            crt_file: Some("tests/integration/nats/data/nats-client.pem".into()),
+            key_file: Some("tests/integration/nats/data/nats-client.key".into()),
             ..Default::default()
         },
     });
@@ -341,7 +341,7 @@ async fn nats_tls_client_cert_invalid() {
     conf.tls = Some(TlsEnableableConfig {
         enabled: Some(true),
         options: TlsConfig {
-            ca_file: Some("tests/data/nats/rootCA.pem".into()),
+            ca_file: Some("tests/integration/nats/data/rootCA.pem".into()),
             ..Default::default()
         },
     });
@@ -363,13 +363,13 @@ async fn nats_tls_jwt_auth_valid() {
     conf.tls = Some(TlsEnableableConfig {
         enabled: Some(true),
         options: TlsConfig {
-            ca_file: Some("tests/data/nats/rootCA.pem".into()),
+            ca_file: Some("tests/integration/nats/data/rootCA.pem".into()),
             ..Default::default()
         },
     });
     conf.auth = Some(NatsAuthConfig::CredentialsFile {
         credentials_file: NatsAuthCredentialsFile {
-            path: "tests/data/nats/nats.creds".into(),
+            path: "tests/integration/nats/data/nats.creds".into(),
         },
     });
 
@@ -390,13 +390,13 @@ async fn nats_tls_jwt_auth_invalid() {
     conf.tls = Some(TlsEnableableConfig {
         enabled: Some(true),
         options: TlsConfig {
-            ca_file: Some("tests/data/nats/rootCA.pem".into()),
+            ca_file: Some("tests/integration/nats/data/rootCA.pem".into()),
             ..Default::default()
         },
     });
     conf.auth = Some(NatsAuthConfig::CredentialsFile {
         credentials_file: NatsAuthCredentialsFile {
-            path: "tests/data/nats/nats-bad.creds".into(),
+            path: "tests/integration/nats/data/nats-bad.creds".into(),
         },
     });
 
diff --git a/scripts/integration/.gitignore b/tests/integration/.gitignore
similarity index 100%
rename from scripts/integration/.gitignore
rename to tests/integration/.gitignore
diff --git a/scripts/integration/README.md b/tests/integration/README.md
similarity index 100%
rename from scripts/integration/README.md
rename to tests/integration/README.md
diff --git a/scripts/integration/amqp/compose.yaml b/tests/integration/amqp/config/compose.yaml
similarity index 95%
rename from scripts/integration/amqp/compose.yaml
rename to tests/integration/amqp/config/compose.yaml
index c6561ae225008..3eb859f93aa60 100644
--- a/scripts/integration/amqp/compose.yaml
+++ b/tests/integration/amqp/config/compose.yaml
@@ -12,7 +12,7 @@ services:
       - RABBITMQ_SSL_CACERTFILE=/code/tests/data/ca/intermediate_server/certs/ca-chain.cert.pem
       - RABBITMQ_SSL_FAIL_IF_NO_PEER_CERT=false
     volumes:
-      - ../../..:/code
+      - ../../../..:/code
 
 networks:
   default:
diff --git a/scripts/integration/amqp/test.yaml b/tests/integration/amqp/config/test.yaml
similarity index 100%
rename from scripts/integration/amqp/test.yaml
rename to tests/integration/amqp/config/test.yaml
diff --git a/scripts/integration/appsignal/test.yaml b/tests/integration/appsignal/config/test.yaml
similarity index 100%
rename from scripts/integration/appsignal/test.yaml
rename to tests/integration/appsignal/config/test.yaml
diff --git a/scripts/integration/aws/compose.yaml b/tests/integration/aws/config/compose.yaml
similarity index 100%
rename from scripts/integration/aws/compose.yaml
rename to tests/integration/aws/config/compose.yaml
diff --git a/scripts/integration/aws/test.yaml b/tests/integration/aws/config/test.yaml
similarity index 96%
rename from scripts/integration/aws/test.yaml
rename to tests/integration/aws/config/test.yaml
index ba1d901dfc217..956f724978fa3 100644
--- a/scripts/integration/aws/test.yaml
+++ b/tests/integration/aws/config/test.yaml
@@ -29,4 +29,4 @@ paths:
 - "src/sinks/aws_*/**"
 - "src/sinks/util/**"
 - "src/transforms/aws_*"
-- "scripts/integration/aws/**"
+- "tests/integration/aws/**"
diff --git a/scripts/integration/axiom/test.yaml b/tests/integration/axiom/config/test.yaml
similarity index 92%
rename from scripts/integration/axiom/test.yaml
rename to tests/integration/axiom/config/test.yaml
index 1e8c3e1d8eec5..934bd739eeaca 100644
--- a/scripts/integration/axiom/test.yaml
+++ b/tests/integration/axiom/config/test.yaml
@@ -18,4 +18,4 @@ matrix:
 paths:
 - "src/sinks/axiom.rs"
 - "src/sinks/util/**"
-- "scripts/integration/axiom/**"
+- "tests/integration/axiom/**"
diff --git a/scripts/integration/azure/compose.yaml b/tests/integration/azure/config/compose.yaml
similarity index 100%
rename from scripts/integration/azure/compose.yaml
rename to tests/integration/azure/config/compose.yaml
diff --git a/scripts/integration/azure/test.yaml b/tests/integration/azure/config/test.yaml
similarity index 92%
rename from scripts/integration/azure/test.yaml
rename to tests/integration/azure/config/test.yaml
index de3f8796763a9..191bea7256cea 100644
--- a/scripts/integration/azure/test.yaml
+++ b/tests/integration/azure/config/test.yaml
@@ -16,4 +16,4 @@ matrix:
 paths:
 - "src/sinks/azure_**"
 - "src/sinks/util/**"
-- "scripts/integration/azure/**"
+- "tests/integration/azure/**"
diff --git a/scripts/integration/clickhouse/compose.yaml b/tests/integration/clickhouse/config/compose.yaml
similarity index 100%
rename from scripts/integration/clickhouse/compose.yaml
rename to tests/integration/clickhouse/config/compose.yaml
diff --git a/scripts/integration/clickhouse/test.yaml b/tests/integration/clickhouse/config/test.yaml
similarity index 90%
rename from scripts/integration/clickhouse/test.yaml
rename to tests/integration/clickhouse/config/test.yaml
index 7b106b914d4dd..3418d810fa638 100644
--- a/scripts/integration/clickhouse/test.yaml
+++ b/tests/integration/clickhouse/config/test.yaml
@@ -14,4 +14,4 @@ matrix:
 paths:
 - "src/sinks/clickhouse/**"
 - "src/sinks/util/**"
-- "scripts/integration/clickhouse/**"
+- "tests/integration/clickhouse/**"
diff --git a/scripts/integration/databend/compose.yaml b/tests/integration/databend/config/compose.yaml
similarity index 91%
rename from scripts/integration/databend/compose.yaml
rename to tests/integration/databend/config/compose.yaml
index 5304afc507960..213fb20af70fe 100644
--- a/scripts/integration/databend/compose.yaml
+++ b/tests/integration/databend/config/compose.yaml
@@ -5,7 +5,7 @@ services:
     image: docker.io/minio/minio
     command: server /data
     volumes:
-      - ../../../tests/data/databend/miniodat/:/data
+      - ../data/miniodat/:/data
   databend:
     image: docker.io/datafuselabs/databend:${CONFIG_VERSION}
     environment:
diff --git a/scripts/integration/databend/test.yaml b/tests/integration/databend/config/test.yaml
similarity index 91%
rename from scripts/integration/databend/test.yaml
rename to tests/integration/databend/config/test.yaml
index 545813974eef5..eaa9f5ad50d86 100644
--- a/scripts/integration/databend/test.yaml
+++ b/tests/integration/databend/config/test.yaml
@@ -15,4 +15,4 @@ matrix:
 paths:
 - "src/sinks/databend/**"
 - "src/sinks/util/**"
-- "scripts/integration/databend/**"
+- "tests/integration/databend/**"
diff --git a/tests/data/databend/miniodat/databend/.keep b/tests/integration/databend/data/miniodat/databend/.keep
similarity index 100%
rename from tests/data/databend/miniodat/databend/.keep
rename to tests/integration/databend/data/miniodat/databend/.keep
diff --git a/scripts/integration/datadog-agent/compose.yaml b/tests/integration/datadog-agent/config/compose.yaml
similarity index 90%
rename from scripts/integration/datadog-agent/compose.yaml
rename to tests/integration/datadog-agent/config/compose.yaml
index 0fe91c2d44c49..4ccf95ff24e00 100644
--- a/scripts/integration/datadog-agent/compose.yaml
+++ b/tests/integration/datadog-agent/config/compose.yaml
@@ -16,7 +16,7 @@ services:
     - DD_HOSTNAME=datadog-agent
     - DD_SERIALIZER_COMPRESSOR_KIND=zstd
     volumes:
-    - ../../../tests/data/datadog-agent/conf.yaml:/etc/datadog-agent/conf.d/test.d/conf.yaml
+    - ../data/conf.yaml:/etc/datadog-agent/conf.d/test.d/conf.yaml
   datadog-trace-agent:
     image: docker.io/datadog/agent:7.31.0
     environment:
diff --git a/scripts/integration/datadog-agent/test.yaml b/tests/integration/datadog-agent/config/test.yaml
similarity index 93%
rename from scripts/integration/datadog-agent/test.yaml
rename to tests/integration/datadog-agent/config/test.yaml
index 6c4b399fdfb3e..c1d3ec50d7592 100644
--- a/scripts/integration/datadog-agent/test.yaml
+++ b/tests/integration/datadog-agent/config/test.yaml
@@ -19,4 +19,4 @@ paths:
 - "src/common/datadog.rs"
 - "src/internal_events/datadog_*"
 - "src/sources/datadog_agent/**"
-- "scripts/integration/datadog-agent/**"
+- "tests/integration/datadog-agent/**"
diff --git a/tests/data/datadog-agent/conf.yaml b/tests/integration/datadog-agent/data/conf.yaml
similarity index 100%
rename from tests/data/datadog-agent/conf.yaml
rename to tests/integration/datadog-agent/data/conf.yaml
diff --git a/scripts/integration/datadog-logs/test.yaml b/tests/integration/datadog-logs/config/test.yaml
similarity index 91%
rename from scripts/integration/datadog-logs/test.yaml
rename to tests/integration/datadog-logs/config/test.yaml
index 7937db5d87158..f10db04ef5661 100644
--- a/scripts/integration/datadog-logs/test.yaml
+++ b/tests/integration/datadog-logs/config/test.yaml
@@ -17,4 +17,4 @@ paths:
 - "src/internal_events/datadog_*"
 - "src/sinks/datadog/logs/**"
 - "src/sinks/util/**"
-- "scripts/integration/datadog-logs/**"
+- "tests/integration/datadog-logs/**"
diff --git a/scripts/integration/datadog-metrics/test.yaml b/tests/integration/datadog-metrics/config/test.yaml
similarity index 91%
rename from scripts/integration/datadog-metrics/test.yaml
rename to tests/integration/datadog-metrics/config/test.yaml
index a45e55a9797f2..55282a361eccb 100644
--- a/scripts/integration/datadog-metrics/test.yaml
+++ b/tests/integration/datadog-metrics/config/test.yaml
@@ -17,4 +17,4 @@ paths:
 - "src/internal_events/datadog_*"
 - "src/sinks/datadog/metrics/**"
 - "src/sinks/util/**"
-- "scripts/integration/datadog-metrics/**"
+- "tests/integration/datadog-metrics/**"
diff --git a/scripts/integration/datadog-traces/compose.yaml b/tests/integration/datadog-traces/config/compose.yaml
similarity index 100%
rename from scripts/integration/datadog-traces/compose.yaml
rename to tests/integration/datadog-traces/config/compose.yaml
diff --git a/scripts/integration/datadog-traces/test.yaml b/tests/integration/datadog-traces/config/test.yaml
similarity index 93%
rename from scripts/integration/datadog-traces/test.yaml
rename to tests/integration/datadog-traces/config/test.yaml
index 5374a6716caab..2a3f162e61b30 100644
--- a/scripts/integration/datadog-traces/test.yaml
+++ b/tests/integration/datadog-traces/config/test.yaml
@@ -21,4 +21,4 @@ paths:
 - "src/internal_events/datadog_*"
 - "src/sinks/datadog/traces/**"
 - "src/sinks/util/**"
-- "scripts/integration/datadog-traces/**"
+- "tests/integration/datadog-traces/**"
diff --git a/scripts/integration/dnstap/compose.yaml b/tests/integration/dnstap/config/compose.yaml
similarity index 90%
rename from scripts/integration/dnstap/compose.yaml
rename to tests/integration/dnstap/config/compose.yaml
index 00264121cb474..b821e292b1ff8 100644
--- a/scripts/integration/dnstap/compose.yaml
+++ b/tests/integration/dnstap/config/compose.yaml
@@ -3,7 +3,7 @@ version: "3"
 services:
   dnstap:
     build:
-      context: ../../../tests/data/dnstap
+      context: ../data
     container_name: vector_dnstap
     hostname: ns.example.com
     volumes:
diff --git a/scripts/integration/dnstap/test.yaml b/tests/integration/dnstap/config/test.yaml
similarity index 93%
rename from scripts/integration/dnstap/test.yaml
rename to tests/integration/dnstap/config/test.yaml
index dab2f93e5e2ff..ed0de1d3ea411 100644
--- a/scripts/integration/dnstap/test.yaml
+++ b/tests/integration/dnstap/config/test.yaml
@@ -19,4 +19,4 @@ paths:
 - "src/internal_events/dnstap.rs"
 - "src/sources/dnstap/**"
 - "src/sources/util/**"
-- "scripts/integration/dnstap/**"
+- "tests/integration/dnstap/**"
diff --git a/tests/data/dnstap/Dockerfile b/tests/integration/dnstap/data/Dockerfile
similarity index 100%
rename from tests/data/dnstap/Dockerfile
rename to tests/integration/dnstap/data/Dockerfile
diff --git a/tests/data/dnstap/configure_bind.sh b/tests/integration/dnstap/data/configure_bind.sh
similarity index 100%
rename from tests/data/dnstap/configure_bind.sh
rename to tests/integration/dnstap/data/configure_bind.sh
diff --git a/tests/data/dnstap/db.example.com b/tests/integration/dnstap/data/db.example.com
similarity index 100%
rename from tests/data/dnstap/db.example.com
rename to tests/integration/dnstap/data/db.example.com
diff --git a/tests/data/dnstap/named.conf.local b/tests/integration/dnstap/data/named.conf.local
similarity index 100%
rename from tests/data/dnstap/named.conf.local
rename to tests/integration/dnstap/data/named.conf.local
diff --git a/tests/data/dnstap/named.conf.options.template b/tests/integration/dnstap/data/named.conf.options.template
similarity index 100%
rename from tests/data/dnstap/named.conf.options.template
rename to tests/integration/dnstap/data/named.conf.options.template
diff --git a/tests/data/dnstap/nsupdate.txt b/tests/integration/dnstap/data/nsupdate.txt
similarity index 100%
rename from tests/data/dnstap/nsupdate.txt
rename to tests/integration/dnstap/data/nsupdate.txt
diff --git a/tests/data/dnstap/run_bind.sh b/tests/integration/dnstap/data/run_bind.sh
similarity index 100%
rename from tests/data/dnstap/run_bind.sh
rename to tests/integration/dnstap/data/run_bind.sh
diff --git a/scripts/integration/docker-logs/test.yaml b/tests/integration/docker-logs/config/test.yaml
similarity index 91%
rename from scripts/integration/docker-logs/test.yaml
rename to tests/integration/docker-logs/config/test.yaml
index 15a432f955c70..0ac64071bd516 100644
--- a/scripts/integration/docker-logs/test.yaml
+++ b/tests/integration/docker-logs/config/test.yaml
@@ -16,4 +16,4 @@ paths:
 - "src/internal_events/docker_logs.rs"
 - "src/sources/docker_logs/**"
 - "src/sources/util/**"
-- "scripts/integration/docker-logs/**"
+- "tests/integration/docker-logs/**"
diff --git a/scripts/integration/elasticsearch/compose.yaml b/tests/integration/elasticsearch/config/compose.yaml
similarity index 94%
rename from scripts/integration/elasticsearch/compose.yaml
rename to tests/integration/elasticsearch/config/compose.yaml
index 6db0746fe8b10..4dcb6636bf4cb 100644
--- a/scripts/integration/elasticsearch/compose.yaml
+++ b/tests/integration/elasticsearch/config/compose.yaml
@@ -24,7 +24,7 @@ services:
     - ELASTIC_PASSWORD=vector
     - ES_JAVA_OPTS=-Xms400m -Xmx400m
     volumes:
-    - ../../../tests/data/ca:/usr/share/elasticsearch/config/certs:ro
+    - ../../../data/ca:/usr/share/elasticsearch/config/certs:ro
 
 networks:
   default:
diff --git a/scripts/integration/elasticsearch/test.yaml b/tests/integration/elasticsearch/config/test.yaml
similarity index 93%
rename from scripts/integration/elasticsearch/test.yaml
rename to tests/integration/elasticsearch/config/test.yaml
index 6b27bca77e0dd..cdf1eedbbb4a7 100644
--- a/scripts/integration/elasticsearch/test.yaml
+++ b/tests/integration/elasticsearch/config/test.yaml
@@ -18,4 +18,4 @@ matrix:
 paths:
 - "src/sinks/elasticsearch/**"
 - "src/sinks/util/**"
-- "scripts/integration/elasticsearch/**"
+- "tests/integration/elasticsearch/**"
diff --git a/scripts/integration/eventstoredb/compose.yaml b/tests/integration/eventstoredb/config/compose.yaml
similarity index 84%
rename from scripts/integration/eventstoredb/compose.yaml
rename to tests/integration/eventstoredb/config/compose.yaml
index eb0ae7b945650..01e6a14ea4117 100644
--- a/scripts/integration/eventstoredb/compose.yaml
+++ b/tests/integration/eventstoredb/config/compose.yaml
@@ -5,7 +5,7 @@ services:
     image: docker.io/eventstore/eventstore:${CONFIG_VERSION}
     command: --insecure --stats-period-sec=1
     volumes:
-    - ../../../tests/data:/etc/vector:ro
+    - ../../../data:/etc/vector:ro
 
 networks:
   default:
diff --git a/scripts/integration/eventstoredb/test.yaml b/tests/integration/eventstoredb/config/test.yaml
similarity index 90%
rename from scripts/integration/eventstoredb/test.yaml
rename to tests/integration/eventstoredb/config/test.yaml
index 9a734db4881eb..2dab755bfd032 100644
--- a/scripts/integration/eventstoredb/test.yaml
+++ b/tests/integration/eventstoredb/config/test.yaml
@@ -12,4 +12,4 @@ paths:
 - "src/internal_events/eventstoredb_metrics.rs"
 - "src/sources/eventstoredb_metrics/**"
 - "src/sources/util/**"
-- "scripts/integration/eventstoredb/**"
+- "tests/integration/eventstoredb/**"
diff --git a/scripts/integration/fluent/test.yaml b/tests/integration/fluent/config/test.yaml
similarity index 92%
rename from scripts/integration/fluent/test.yaml
rename to tests/integration/fluent/config/test.yaml
index 6593f8379b216..f5f977aa1f637 100644
--- a/scripts/integration/fluent/test.yaml
+++ b/tests/integration/fluent/config/test.yaml
@@ -17,4 +17,4 @@ paths:
 - "src/internal_events/fluent.rs"
 - "src/sources/fluent/**"
 - "src/sources/util/**"
-- "scripts/integration/fluent/**"
+- "tests/integration/fluent/**"
diff --git a/tests/data/fluent/fluent-bit.conf b/tests/integration/fluent/data/fluent-bit.conf
similarity index 100%
rename from tests/data/fluent/fluent-bit.conf
rename to tests/integration/fluent/data/fluent-bit.conf
diff --git a/tests/data/fluent/fluentd-gzip.conf b/tests/integration/fluent/data/fluentd-gzip.conf
similarity index 100%
rename from tests/data/fluent/fluentd-gzip.conf
rename to tests/integration/fluent/data/fluentd-gzip.conf
diff --git a/tests/data/fluent/fluentd-plain.conf b/tests/integration/fluent/data/fluentd-plain.conf
similarity index 100%
rename from tests/data/fluent/fluentd-plain.conf
rename to tests/integration/fluent/data/fluentd-plain.conf
diff --git a/scripts/integration/gcp/auth.json b/tests/integration/gcp/config/auth.json
similarity index 100%
rename from scripts/integration/gcp/auth.json
rename to tests/integration/gcp/config/auth.json
diff --git a/scripts/integration/gcp/compose.yaml b/tests/integration/gcp/config/compose.yaml
similarity index 100%
rename from scripts/integration/gcp/compose.yaml
rename to tests/integration/gcp/config/compose.yaml
diff --git a/scripts/integration/gcp/invalidauth.json b/tests/integration/gcp/config/invalidauth.json
similarity index 100%
rename from scripts/integration/gcp/invalidauth.json
rename to tests/integration/gcp/config/invalidauth.json
diff --git a/scripts/integration/gcp/public.pem b/tests/integration/gcp/config/public.pem
similarity index 100%
rename from scripts/integration/gcp/public.pem
rename to tests/integration/gcp/config/public.pem
diff --git a/scripts/integration/gcp/test.yaml b/tests/integration/gcp/config/test.yaml
similarity index 94%
rename from scripts/integration/gcp/test.yaml
rename to tests/integration/gcp/config/test.yaml
index 772a416d2162a..be5d1fcd2cc82 100644
--- a/scripts/integration/gcp/test.yaml
+++ b/tests/integration/gcp/config/test.yaml
@@ -20,4 +20,4 @@ paths:
 - "src/sinks/gcp/**"
 - "src/sinks/util/**"
 - "src/gcp.rs"
-- "scripts/integration/gcp/**"
+- "tests/integration/gcp/**"
diff --git a/scripts/integration/greptimedb/compose.yaml b/tests/integration/greptimedb/config/compose.yaml
similarity index 100%
rename from scripts/integration/greptimedb/compose.yaml
rename to tests/integration/greptimedb/config/compose.yaml
diff --git a/scripts/integration/greptimedb/test.yaml b/tests/integration/greptimedb/config/test.yaml
similarity index 93%
rename from scripts/integration/greptimedb/test.yaml
rename to tests/integration/greptimedb/config/test.yaml
index eb1754364172a..17593b891df8c 100644
--- a/scripts/integration/greptimedb/test.yaml
+++ b/tests/integration/greptimedb/config/test.yaml
@@ -18,4 +18,4 @@ matrix:
 # expressions are evaluated using https://github.com/micromatch/picomatch
 paths:
 - "src/sinks/greptimedb/**"
-- "scripts/integration/greptimedb/**"
+- "tests/integration/greptimedb/**"
diff --git a/scripts/integration/http-client/compose.yaml b/tests/integration/http-client/config/compose.yaml
similarity index 61%
rename from scripts/integration/http-client/compose.yaml
rename to tests/integration/http-client/config/compose.yaml
index 11ad2bc76591a..7ad5dfc47386b 100644
--- a/scripts/integration/http-client/compose.yaml
+++ b/tests/integration/http-client/config/compose.yaml
@@ -6,7 +6,7 @@ services:
     command:
     - /data
     volumes:
-    - ../../../tests/data/http-client/serve:/data
+    - ../data/serve:/data
   dufs-auth:
     image: docker.io/sigoden/dufs:${CONFIG_VERSION}
     command:
@@ -16,7 +16,7 @@ services:
     - basic
     - /data
     volumes:
-    - ../../../tests/data/http-client/serve:/data
+    - ../data/serve:/data
   dufs-https:
     image: docker.io/sigoden/dufs:${CONFIG_VERSION}
     command:
@@ -26,9 +26,9 @@ services:
     - /certs/ca.key.pem
     - /data
     volumes:
-    - ../../../tests/data/http-client/serve:/data
-    - ../../../tests/data/ca/intermediate_server/certs/dufs-https-chain.cert.pem:/certs/ca.cert.pem
-    - ../../../tests/data/ca/intermediate_server/private/dufs-https.key.pem:/certs/ca.key.pem
+    - ../data/serve:/data
+    - ../../../data/ca/intermediate_server/certs/dufs-https-chain.cert.pem:/certs/ca.cert.pem
+    - ../../../data/ca/intermediate_server/private/dufs-https.key.pem:/certs/ca.key.pem
 
 networks:
   default:
diff --git a/scripts/integration/http-client/test.yaml b/tests/integration/http-client/config/test.yaml
similarity index 91%
rename from scripts/integration/http-client/test.yaml
rename to tests/integration/http-client/config/test.yaml
index 0ae2b49bf2c76..a56570dc5cf81 100644
--- a/scripts/integration/http-client/test.yaml
+++ b/tests/integration/http-client/config/test.yaml
@@ -16,4 +16,4 @@ matrix:
 paths:
 - "src/sources/http_client/**"
 - "src/sources/util/**"
-- "scripts/integration/http-client/**"
+- "tests/integration/http-client/**"
diff --git a/tests/data/http-client/certs/invalid-ca-cert.pem b/tests/integration/http-client/data/certs/invalid-ca-cert.pem
similarity index 100%
rename from tests/data/http-client/certs/invalid-ca-cert.pem
rename to tests/integration/http-client/data/certs/invalid-ca-cert.pem
diff --git a/tests/data/http-client/serve/logs/bytes b/tests/integration/http-client/data/serve/logs/bytes
similarity index 100%
rename from tests/data/http-client/serve/logs/bytes
rename to tests/integration/http-client/data/serve/logs/bytes
diff --git a/tests/data/http-client/serve/logs/json.json b/tests/integration/http-client/data/serve/logs/json.json
similarity index 100%
rename from tests/data/http-client/serve/logs/json.json
rename to tests/integration/http-client/data/serve/logs/json.json
diff --git a/tests/data/http-client/serve/metrics/native.json b/tests/integration/http-client/data/serve/metrics/native.json
similarity index 100%
rename from tests/data/http-client/serve/metrics/native.json
rename to tests/integration/http-client/data/serve/metrics/native.json
diff --git a/tests/data/http-client/serve/traces/native.json b/tests/integration/http-client/data/serve/traces/native.json
similarity index 100%
rename from tests/data/http-client/serve/traces/native.json
rename to tests/integration/http-client/data/serve/traces/native.json
diff --git a/scripts/integration/humio/compose.yaml b/tests/integration/humio/config/compose.yaml
similarity index 100%
rename from scripts/integration/humio/compose.yaml
rename to tests/integration/humio/config/compose.yaml
diff --git a/scripts/integration/humio/test.yaml b/tests/integration/humio/config/test.yaml
similarity index 91%
rename from scripts/integration/humio/test.yaml
rename to tests/integration/humio/config/test.yaml
index ad242e622f5b2..a8cdebeba3b19 100644
--- a/scripts/integration/humio/test.yaml
+++ b/tests/integration/humio/config/test.yaml
@@ -15,4 +15,4 @@ matrix:
 paths:
 - "src/sinks/humio/**"
 - "src/sinks/util/**"
-- "scripts/integration/humio/**"
+- "tests/integration/humio/**"
diff --git a/scripts/integration/influxdb/compose.yaml b/tests/integration/influxdb/config/compose.yaml
similarity index 94%
rename from scripts/integration/influxdb/compose.yaml
rename to tests/integration/influxdb/config/compose.yaml
index 7499564740491..b5c31c006ab06 100644
--- a/scripts/integration/influxdb/compose.yaml
+++ b/tests/integration/influxdb/config/compose.yaml
@@ -13,7 +13,7 @@ services:
     - INFLUXDB_HTTP_HTTPS_CERTIFICATE=/etc/ssl/intermediate_server/certs/influxdb-v1-tls-chain.cert.pem
     - INFLUXDB_HTTP_HTTPS_PRIVATE_KEY=/etc/ssl/intermediate_server/private/influxdb-v1-tls.key.pem
     volumes:
-    - ../../../tests/data/ca:/etc/ssl:ro
+    - ../../../data/ca:/etc/ssl:ro
   influxdb-v2:
     image: docker.io/influxdb:2.0
     command: influxd --reporting-disabled
diff --git a/scripts/integration/influxdb/test.yaml b/tests/integration/influxdb/config/test.yaml
similarity index 93%
rename from scripts/integration/influxdb/test.yaml
rename to tests/integration/influxdb/config/test.yaml
index 3dad78af2e2e8..35bf2f72691bf 100644
--- a/scripts/integration/influxdb/test.yaml
+++ b/tests/integration/influxdb/config/test.yaml
@@ -17,4 +17,4 @@ paths:
 - "src/internal_events/influxdb.rs"
 - "src/sinks/influxdb/**"
 - "src/sinks/util/**"
-- "scripts/integration/influxdb/**"
+- "tests/integration/influxdb/**"
diff --git a/scripts/integration/shutdown/compose.yaml b/tests/integration/kafka/config/compose.yaml
similarity index 80%
rename from scripts/integration/shutdown/compose.yaml
rename to tests/integration/kafka/config/compose.yaml
index 0437b8b866f7a..81a35dd64ec94 100644
--- a/scripts/integration/shutdown/compose.yaml
+++ b/tests/integration/kafka/config/compose.yaml
@@ -31,9 +31,9 @@ services:
     - 9092:9092
     - 9093:9093
     volumes:
-    - ../../../tests/data/ca/intermediate_server/private/kafka.pass:/etc/kafka/secrets/kafka.pass:ro
-    - ../../../tests/data/ca/intermediate_server/private/kafka.p12:/etc/kafka/secrets/kafka.p12:ro
-    - ../../../tests/data/kafka_server_jaas.conf:/etc/kafka/kafka_server_jaas.conf
+    - ../../../data/ca/intermediate_server/private/kafka.pass:/etc/kafka/secrets/kafka.pass:ro
+    - ../../../data/ca/intermediate_server/private/kafka.p12:/etc/kafka/secrets/kafka.p12:ro
+    - ../../shared/data/kafka_server_jaas.conf:/etc/kafka/kafka_server_jaas.conf
 
 networks:
   default:
diff --git a/scripts/integration/kafka/test.yaml b/tests/integration/kafka/config/test.yaml
similarity index 92%
rename from scripts/integration/kafka/test.yaml
rename to tests/integration/kafka/config/test.yaml
index a52131e6e5a1b..9619b4d7ea0f1 100644
--- a/scripts/integration/kafka/test.yaml
+++ b/tests/integration/kafka/config/test.yaml
@@ -18,4 +18,4 @@ paths:
 - "src/sources/kafka.rs"
 - "src/sources/util/**"
 - "src/kafka.rs"
-- "scripts/integration/kafka/**"
+- "tests/integration/kafka/**"
diff --git a/scripts/integration/logstash/compose.yaml b/tests/integration/logstash/config/compose.yaml
similarity index 60%
rename from scripts/integration/logstash/compose.yaml
rename to tests/integration/logstash/config/compose.yaml
index 1e7a17918435b..af024d0855453 100644
--- a/scripts/integration/logstash/compose.yaml
+++ b/tests/integration/logstash/config/compose.yaml
@@ -5,13 +5,13 @@ services:
     image: docker.elastic.co/beats/heartbeat:${CONFIG_VERSION}
     command: -environment=container -strict.perms=false
     volumes:
-    - ../../../tests/data/logstash/heartbeat.yml:/usr/share/heartbeat/heartbeat.yml:ro
+    - ../data/heartbeat.yml:/usr/share/heartbeat/heartbeat.yml:ro
   logstash:
     image: docker.elastic.co/logstash/logstash:7.13.1
     volumes:
     - /dev/null:/usr/share/logstash/pipeline/logstash.yml
-    - ../../../tests/data/host.docker.internal.crt:/tmp/logstash.crt
-    - ../../../tests/data/logstash/logstash.conf:/usr/share/logstash/pipeline/logstash.conf
+    - ../../shared/data/host.docker.internal.crt:/tmp/logstash.crt
+    - ../data/logstash.conf:/usr/share/logstash/pipeline/logstash.conf
 
 networks:
   default:
diff --git a/scripts/integration/logstash/test.yaml b/tests/integration/logstash/config/test.yaml
similarity index 91%
rename from scripts/integration/logstash/test.yaml
rename to tests/integration/logstash/config/test.yaml
index a73a040b6a996..e0f26afbec7f7 100644
--- a/scripts/integration/logstash/test.yaml
+++ b/tests/integration/logstash/config/test.yaml
@@ -15,4 +15,4 @@ matrix:
 paths:
 - "src/sources/logstash.rs"
 - "src/sources/util/**"
-- "scripts/integration/logstash/**"
+- "tests/integration/logstash/**"
diff --git a/tests/data/logstash/heartbeat.yml b/tests/integration/logstash/data/heartbeat.yml
similarity index 100%
rename from tests/data/logstash/heartbeat.yml
rename to tests/integration/logstash/data/heartbeat.yml
diff --git a/tests/data/logstash/logstash.conf b/tests/integration/logstash/data/logstash.conf
similarity index 100%
rename from tests/data/logstash/logstash.conf
rename to tests/integration/logstash/data/logstash.conf
diff --git a/scripts/integration/loki/compose.yaml b/tests/integration/loki/config/compose.yaml
similarity index 100%
rename from scripts/integration/loki/compose.yaml
rename to tests/integration/loki/config/compose.yaml
diff --git a/scripts/integration/loki/test.yaml b/tests/integration/loki/config/test.yaml
similarity index 91%
rename from scripts/integration/loki/test.yaml
rename to tests/integration/loki/config/test.yaml
index 60f762dd569b7..9a86d9ce6c29d 100644
--- a/scripts/integration/loki/test.yaml
+++ b/tests/integration/loki/config/test.yaml
@@ -15,4 +15,4 @@ paths:
 - "src/internal_events/loki.rs"
 - "src/sinks/loki/**"
 - "src/sinks/util/**"
-- "scripts/integration/loki/**"
+- "tests/integration/loki/**"
diff --git a/scripts/integration/mongodb/compose.yaml b/tests/integration/mongodb/config/compose.yaml
similarity index 100%
rename from scripts/integration/mongodb/compose.yaml
rename to tests/integration/mongodb/config/compose.yaml
diff --git a/scripts/integration/mongodb/test.yaml b/tests/integration/mongodb/config/test.yaml
similarity index 93%
rename from scripts/integration/mongodb/test.yaml
rename to tests/integration/mongodb/config/test.yaml
index 76ddefab16f46..10da02aca38dc 100644
--- a/scripts/integration/mongodb/test.yaml
+++ b/tests/integration/mongodb/config/test.yaml
@@ -16,4 +16,4 @@ paths:
 - "src/internal_events/mongodb_metrics.rs"
 - "src/sources/mongodb_metrics/**"
 - "src/sources/util/**"
-- "scripts/integration/mongodb/**"
+- "tests/integration/mongodb/**"
diff --git a/scripts/integration/mqtt/compose.yaml b/tests/integration/mqtt/config/compose.yaml
similarity index 100%
rename from scripts/integration/mqtt/compose.yaml
rename to tests/integration/mqtt/config/compose.yaml
diff --git a/scripts/integration/mqtt/test.yaml b/tests/integration/mqtt/config/test.yaml
similarity index 100%
rename from scripts/integration/mqtt/test.yaml
rename to tests/integration/mqtt/config/test.yaml
diff --git a/scripts/integration/nats/compose.yaml b/tests/integration/nats/config/compose.yaml
similarity index 81%
rename from scripts/integration/nats/compose.yaml
rename to tests/integration/nats/config/compose.yaml
index 24a0495772ba6..f77020b57afee 100644
--- a/scripts/integration/nats/compose.yaml
+++ b/tests/integration/nats/config/compose.yaml
@@ -21,35 +21,35 @@ services:
     - --config
     - /usr/share/nats/config/nats-nkey.conf
     volumes:
-    - ../../../tests/data/nats:/usr/share/nats/config
+    - ../data:/usr/share/nats/config
   nats-tls:
     image: docker.io/library/nats:${CONFIG_VERSION}
     command:
     - --config
     - /usr/share/nats/config/nats-tls.conf
     volumes:
-    - ../../../tests/data/nats:/usr/share/nats/config
+    - ../data:/usr/share/nats/config
   nats-tls-client-cert:
     image: docker.io/library/nats:${CONFIG_VERSION}
     command:
     - --config
     - /usr/share/nats/config/nats-tls-client-cert.conf
     volumes:
-    - ../../../tests/data/nats:/usr/share/nats/config
+    - ../data:/usr/share/nats/config
   nats-jwt:
     image: docker.io/library/nats:${CONFIG_VERSION}
     command:
     - --config
     - /usr/share/nats/config/nats-jwt.conf
     volumes:
-    - ../../../tests/data/nats:/usr/share/nats/config
+    - ../data:/usr/share/nats/config
   nats-jetstream-test:
     image: docker.io/library/nats:${CONFIG_VERSION}
     command:
     - --config
     - /usr/share/nats/config/nats-jetstream.conf
     volumes:
-    - ../../../tests/data/nats:/usr/share/nats/config
+    - ../data:/usr/share/nats/config
 
 networks:
   default:
diff --git a/scripts/integration/nats/test.yaml b/tests/integration/nats/config/test.yaml
similarity index 95%
rename from scripts/integration/nats/test.yaml
rename to tests/integration/nats/config/test.yaml
index 171a1c4ae6a3e..2f67676fa5cd2 100644
--- a/scripts/integration/nats/test.yaml
+++ b/tests/integration/nats/config/test.yaml
@@ -25,4 +25,4 @@ paths:
   - "src/sinks/nats/**"
   - "src/sinks/util/**"
   - "src/nats.rs"
-  - "scripts/integration/nats/**"
+  - "tests/integration/nats/**"
diff --git a/tests/data/nats/README.md b/tests/integration/nats/data/README.md
similarity index 100%
rename from tests/data/nats/README.md
rename to tests/integration/nats/data/README.md
diff --git a/tests/data/nats/nats-bad.creds b/tests/integration/nats/data/nats-bad.creds
similarity index 100%
rename from tests/data/nats/nats-bad.creds
rename to tests/integration/nats/data/nats-bad.creds
diff --git a/tests/data/nats/nats-client-cert.pem b/tests/integration/nats/data/nats-client-cert.pem
similarity index 100%
rename from tests/data/nats/nats-client-cert.pem
rename to tests/integration/nats/data/nats-client-cert.pem
diff --git a/tests/data/nats/nats-client.key b/tests/integration/nats/data/nats-client.key
similarity index 100%
rename from tests/data/nats/nats-client.key
rename to tests/integration/nats/data/nats-client.key
diff --git a/tests/data/nats/nats-client.pem b/tests/integration/nats/data/nats-client.pem
similarity index 100%
rename from tests/data/nats/nats-client.pem
rename to tests/integration/nats/data/nats-client.pem
diff --git a/tests/data/nats/nats-jetstream.conf b/tests/integration/nats/data/nats-jetstream.conf
similarity index 100%
rename from tests/data/nats/nats-jetstream.conf
rename to tests/integration/nats/data/nats-jetstream.conf
diff --git a/tests/data/nats/nats-jwt.conf b/tests/integration/nats/data/nats-jwt.conf
similarity index 100%
rename from tests/data/nats/nats-jwt.conf
rename to tests/integration/nats/data/nats-jwt.conf
diff --git a/tests/data/nats/nats-nkey.conf b/tests/integration/nats/data/nats-nkey.conf
similarity index 100%
rename from tests/data/nats/nats-nkey.conf
rename to tests/integration/nats/data/nats-nkey.conf
diff --git a/tests/data/nats/nats-server.key b/tests/integration/nats/data/nats-server.key
similarity index 100%
rename from tests/data/nats/nats-server.key
rename to tests/integration/nats/data/nats-server.key
diff --git a/tests/data/nats/nats-server.pem b/tests/integration/nats/data/nats-server.pem
similarity index 100%
rename from tests/data/nats/nats-server.pem
rename to tests/integration/nats/data/nats-server.pem
diff --git a/tests/data/nats/nats-tls-client-cert.conf b/tests/integration/nats/data/nats-tls-client-cert.conf
similarity index 100%
rename from tests/data/nats/nats-tls-client-cert.conf
rename to tests/integration/nats/data/nats-tls-client-cert.conf
diff --git a/tests/data/nats/nats-tls.conf b/tests/integration/nats/data/nats-tls.conf
similarity index 100%
rename from tests/data/nats/nats-tls.conf
rename to tests/integration/nats/data/nats-tls.conf
diff --git a/tests/data/nats/nats.creds b/tests/integration/nats/data/nats.creds
similarity index 100%
rename from tests/data/nats/nats.creds
rename to tests/integration/nats/data/nats.creds
diff --git a/tests/data/nats/rootCA.pem b/tests/integration/nats/data/rootCA.pem
similarity index 100%
rename from tests/data/nats/rootCA.pem
rename to tests/integration/nats/data/rootCA.pem
diff --git a/scripts/integration/nginx/compose.yaml b/tests/integration/nginx/config/compose.yaml
similarity index 81%
rename from scripts/integration/nginx/compose.yaml
rename to tests/integration/nginx/config/compose.yaml
index 78efa46a1c578..3caf63a002f11 100644
--- a/scripts/integration/nginx/compose.yaml
+++ b/tests/integration/nginx/config/compose.yaml
@@ -11,13 +11,13 @@ services:
   nginx:
     image: docker.io/nginx:${CONFIG_VERSION}
     volumes:
-    - ../../../tests/data/nginx/:/etc/nginx:ro
+    - ../data/:/etc/nginx:ro
     networks:
     - default
   nginx-proxy:
     image: docker.io/nginx:${CONFIG_VERSION}
     volumes:
-    - ../../../tests/data/nginx/:/etc/nginx:ro
+    - ../data/:/etc/nginx:ro
     networks:
     - proxy
 
diff --git a/scripts/integration/nginx/test.yaml b/tests/integration/nginx/config/test.yaml
similarity index 93%
rename from scripts/integration/nginx/test.yaml
rename to tests/integration/nginx/config/test.yaml
index 934873608d5ef..8d9014b657787 100644
--- a/scripts/integration/nginx/test.yaml
+++ b/tests/integration/nginx/config/test.yaml
@@ -18,4 +18,4 @@ paths:
 - "src/internal_events/nginx_metrics.rs"
 - "src/sources/nginx_metrics/**"
 - "src/sources/util/**"
-- "scripts/integration/nginx/**"
+- "tests/integration/nginx/**"
diff --git a/tests/data/nginx/nginx.conf b/tests/integration/nginx/data/nginx.conf
similarity index 100%
rename from tests/data/nginx/nginx.conf
rename to tests/integration/nginx/data/nginx.conf
diff --git a/tests/data/nginx/nginx_auth_basic.conf b/tests/integration/nginx/data/nginx_auth_basic.conf
similarity index 100%
rename from tests/data/nginx/nginx_auth_basic.conf
rename to tests/integration/nginx/data/nginx_auth_basic.conf
diff --git a/scripts/integration/opentelemetry/compose.yaml b/tests/integration/opentelemetry/config/compose.yaml
similarity index 71%
rename from scripts/integration/opentelemetry/compose.yaml
rename to tests/integration/opentelemetry/config/compose.yaml
index b85cc417cedaf..d8f0c95d20fbc 100644
--- a/scripts/integration/opentelemetry/compose.yaml
+++ b/tests/integration/opentelemetry/config/compose.yaml
@@ -4,7 +4,7 @@ services:
   opentelemetry-collector:
     image: docker.io/otel/opentelemetry-collector-contrib:${CONFIG_VERSION}
     volumes:
-    - ../../../tests/data/opentelemetry/config.yaml:/etc/otelcol-contrib/config.yaml
+    - ../data/config.yaml:/etc/otelcol-contrib/config.yaml
 
 networks:
   default:
diff --git a/scripts/integration/opentelemetry/test.yaml b/tests/integration/opentelemetry/config/test.yaml
similarity index 91%
rename from scripts/integration/opentelemetry/test.yaml
rename to tests/integration/opentelemetry/config/test.yaml
index e586c444affac..91a2968fdfae0 100644
--- a/scripts/integration/opentelemetry/test.yaml
+++ b/tests/integration/opentelemetry/config/test.yaml
@@ -16,4 +16,4 @@ matrix:
 paths:
 - "src/sources/opentelemetry/**"
 - "src/sources/util/**"
-- "scripts/integration/opentelemetry/**"
+- "tests/integration/opentelemetry/**"
diff --git a/tests/data/opentelemetry/config.yaml b/tests/integration/opentelemetry/data/config.yaml
similarity index 100%
rename from tests/data/opentelemetry/config.yaml
rename to tests/integration/opentelemetry/data/config.yaml
diff --git a/scripts/integration/postgres/compose.yaml b/tests/integration/postgres/config/compose.yaml
similarity index 83%
rename from scripts/integration/postgres/compose.yaml
rename to tests/integration/postgres/config/compose.yaml
index 8c3ccb12a7913..017e497c81811 100644
--- a/scripts/integration/postgres/compose.yaml
+++ b/tests/integration/postgres/config/compose.yaml
@@ -9,8 +9,8 @@ services:
     - POSTGRES_PASSWORD=vector
     volumes:
     - socket:/var/run/postgresql
-    - ../../../tests/data/postgres-init.sh:/postgres-init.sh:ro
-    - ../../../tests/data/ca:/certs:ro
+    - ../data/postgres-init.sh:/postgres-init.sh:ro
+    - ../../../data/ca:/certs:ro
 
 volumes:
   # Use external volume 'postgres_socket' that's shared with the test runner
diff --git a/scripts/integration/postgres/test.yaml b/tests/integration/postgres/config/test.yaml
similarity index 93%
rename from scripts/integration/postgres/test.yaml
rename to tests/integration/postgres/config/test.yaml
index a89049f545948..85c012a11fa5f 100644
--- a/scripts/integration/postgres/test.yaml
+++ b/tests/integration/postgres/config/test.yaml
@@ -22,4 +22,4 @@ paths:
 - "src/sinks/postgres/**"
 - "src/sources/postgresql_metrics.rs"
 - "src/sources/util/**"
-- "scripts/integration/postgres/**"
+- "tests/integration/postgres/**"
diff --git a/tests/data/postgres-init.sh b/tests/integration/postgres/data/postgres-init.sh
similarity index 100%
rename from tests/data/postgres-init.sh
rename to tests/integration/postgres/data/postgres-init.sh
diff --git a/scripts/integration/prometheus/compose.yaml b/tests/integration/prometheus/config/compose.yaml
similarity index 89%
rename from scripts/integration/prometheus/compose.yaml
rename to tests/integration/prometheus/config/compose.yaml
index 9f618f8f521f0..a945f730ce834 100644
--- a/scripts/integration/prometheus/compose.yaml
+++ b/tests/integration/prometheus/config/compose.yaml
@@ -15,12 +15,12 @@ services:
     - INFLUXDB_HTTP_HTTPS_CERTIFICATE=/etc/ssl/intermediate_server/certs/influxdb-v1-tls-chain.cert.pem
     - INFLUXDB_HTTP_HTTPS_PRIVATE_KEY=/etc/ssl/intermediate_server/private/influxdb-v1-tls.key.pem
     volumes:
-    - ../../../tests/data/ca:/etc/ssl:ro
+    - ../../../data/ca:/etc/ssl:ro
   prometheus:
     image: docker.io/prom/prometheus:${CONFIG_PROMETHEUS}
     command: --config.file=/etc/vector/prometheus.yaml
     volumes:
-    - ../../../tests/data:/etc/vector:ro
+    - ../data/prometheus.yaml:/etc/vector/prometheus.yaml:ro
 
 networks:
   default:
diff --git a/scripts/integration/prometheus/test.yaml b/tests/integration/prometheus/config/test.yaml
similarity index 92%
rename from scripts/integration/prometheus/test.yaml
rename to tests/integration/prometheus/config/test.yaml
index d2db2d9282b6b..455338053e2ff 100644
--- a/scripts/integration/prometheus/test.yaml
+++ b/tests/integration/prometheus/config/test.yaml
@@ -18,4 +18,4 @@ paths:
 - "src/sources/util/**"
 - "src/sinks/prometheus/**"
 - "src/sinks/util/**"
-- "scripts/integration/prometheus/**"
+- "tests/integration/prometheus/**"
diff --git a/tests/data/prometheus.yaml b/tests/integration/prometheus/data/prometheus.yaml
similarity index 100%
rename from tests/data/prometheus.yaml
rename to tests/integration/prometheus/data/prometheus.yaml
diff --git a/scripts/integration/pulsar/compose.yaml b/tests/integration/pulsar/config/compose.yaml
similarity index 64%
rename from scripts/integration/pulsar/compose.yaml
rename to tests/integration/pulsar/config/compose.yaml
index 1e4742c8fc3fe..cca9c9de8d713 100644
--- a/scripts/integration/pulsar/compose.yaml
+++ b/tests/integration/pulsar/config/compose.yaml
@@ -13,9 +13,9 @@ services:
       - PULSAR_PREFIX_tlsCertificateFilePath=/etc/pulsar/certs/pulsar.cert.pem
       - PULSAR_PREFIX_tlsTrustCertsFilePath=/etc/pulsar/certs/ca-chain.cert.pem
     volumes:
-      - ../../../tests/data/ca/intermediate_server/private/pulsar.key.pem:/etc/pulsar/certs/pulsar.key.pem:ro
-      - ../../../tests/data//ca/intermediate_server/certs/pulsar.cert.pem:/etc/pulsar/certs/pulsar.cert.pem:ro
-      - ../../../tests/data/ca/intermediate_server/certs/ca-chain.cert.pem:/etc/pulsar/certs/ca-chain.cert.pem:ro
+      - ../../../data/ca/intermediate_server/private/pulsar.key.pem:/etc/pulsar/certs/pulsar.key.pem:ro
+      - ../../../data/ca/intermediate_server/certs/pulsar.cert.pem:/etc/pulsar/certs/pulsar.cert.pem:ro
+      - ../../../data/ca/intermediate_server/certs/ca-chain.cert.pem:/etc/pulsar/certs/ca-chain.cert.pem:ro
 
 networks:
   default:
diff --git a/scripts/integration/pulsar/test.yaml b/tests/integration/pulsar/config/test.yaml
similarity index 91%
rename from scripts/integration/pulsar/test.yaml
rename to tests/integration/pulsar/config/test.yaml
index b629a582d0a62..9d7f33f60dac5 100644
--- a/scripts/integration/pulsar/test.yaml
+++ b/tests/integration/pulsar/config/test.yaml
@@ -15,4 +15,4 @@ paths:
 - "src/internal_events/pulsar.rs"
 - "src/sinks/pulsar/**"
 - "src/sinks/util/**"
-- "scripts/integration/pulsar/**"
+- "tests/integration/pulsar/**"
diff --git a/scripts/integration/redis/compose.yaml b/tests/integration/redis/config/compose.yaml
similarity index 100%
rename from scripts/integration/redis/compose.yaml
rename to tests/integration/redis/config/compose.yaml
diff --git a/scripts/integration/redis/test.yaml b/tests/integration/redis/config/test.yaml
similarity index 93%
rename from scripts/integration/redis/test.yaml
rename to tests/integration/redis/config/test.yaml
index 6b2d9bfa3745a..fdfc54e0446ec 100644
--- a/scripts/integration/redis/test.yaml
+++ b/tests/integration/redis/config/test.yaml
@@ -18,4 +18,4 @@ paths:
 - "src/sources/util/**"
 - "src/sinks/redis.rs"
 - "src/sinks/util/**"
-- "scripts/integration/redis/**"
+- "tests/integration/redis/**"
diff --git a/tests/data/host.docker.internal.crt b/tests/integration/shared/data/host.docker.internal.crt
similarity index 100%
rename from tests/data/host.docker.internal.crt
rename to tests/integration/shared/data/host.docker.internal.crt
diff --git a/tests/data/host.docker.internal.key b/tests/integration/shared/data/host.docker.internal.key
similarity index 100%
rename from tests/data/host.docker.internal.key
rename to tests/integration/shared/data/host.docker.internal.key
diff --git a/tests/data/kafka_server_jaas.conf b/tests/integration/shared/data/kafka_server_jaas.conf
similarity index 100%
rename from tests/data/kafka_server_jaas.conf
rename to tests/integration/shared/data/kafka_server_jaas.conf
diff --git a/scripts/integration/kafka/compose.yaml b/tests/integration/shutdown/config/compose.yaml
similarity index 80%
rename from scripts/integration/kafka/compose.yaml
rename to tests/integration/shutdown/config/compose.yaml
index 0437b8b866f7a..81a35dd64ec94 100644
--- a/scripts/integration/kafka/compose.yaml
+++ b/tests/integration/shutdown/config/compose.yaml
@@ -31,9 +31,9 @@ services:
     - 9092:9092
     - 9093:9093
     volumes:
-    - ../../../tests/data/ca/intermediate_server/private/kafka.pass:/etc/kafka/secrets/kafka.pass:ro
-    - ../../../tests/data/ca/intermediate_server/private/kafka.p12:/etc/kafka/secrets/kafka.p12:ro
-    - ../../../tests/data/kafka_server_jaas.conf:/etc/kafka/kafka_server_jaas.conf
+    - ../../../data/ca/intermediate_server/private/kafka.pass:/etc/kafka/secrets/kafka.pass:ro
+    - ../../../data/ca/intermediate_server/private/kafka.p12:/etc/kafka/secrets/kafka.p12:ro
+    - ../../shared/data/kafka_server_jaas.conf:/etc/kafka/kafka_server_jaas.conf
 
 networks:
   default:
diff --git a/scripts/integration/shutdown/test.yaml b/tests/integration/shutdown/config/test.yaml
similarity index 100%
rename from scripts/integration/shutdown/test.yaml
rename to tests/integration/shutdown/config/test.yaml
diff --git a/scripts/integration/splunk/compose.yaml b/tests/integration/splunk/config/compose.yaml
similarity index 83%
rename from scripts/integration/splunk/compose.yaml
rename to tests/integration/splunk/config/compose.yaml
index cfae5c07b545d..a252674d2bffa 100644
--- a/scripts/integration/splunk/compose.yaml
+++ b/tests/integration/splunk/config/compose.yaml
@@ -8,7 +8,7 @@ services:
     - SPLUNK_PASSWORD=password
     - SPLUNK_HEC_TOKEN=abcd1234
     volumes:
-    - ../../../tests/data/splunk/default.yml:/tmp/defaults/default.yml
+    - ../data/splunk/default.yml:/tmp/defaults/default.yml
     ports:
     - 8000:8000
     - 8088:8088
diff --git a/scripts/integration/splunk/test.yaml b/tests/integration/splunk/config/test.yaml
similarity index 93%
rename from scripts/integration/splunk/test.yaml
rename to tests/integration/splunk/config/test.yaml
index 85de787cbe1e6..71a5c7994fe4a 100644
--- a/scripts/integration/splunk/test.yaml
+++ b/tests/integration/splunk/config/test.yaml
@@ -18,4 +18,4 @@ paths:
 - "src/sources/util/**"
 - "src/sinks/splunk_hec/**"
 - "src/sinks/util/**"
-- "scripts/integration/splunk/**"
+- "tests/integration/splunk/**"
diff --git a/tests/data/splunk/default.yml b/tests/integration/splunk/data/default.yml
similarity index 93%
rename from tests/data/splunk/default.yml
rename to tests/integration/splunk/data/default.yml
index 0a7a05f2eb3f9..dfd83a6360ed0 100644
--- a/tests/data/splunk/default.yml
+++ b/tests/integration/splunk/data/default.yml
@@ -13,10 +13,10 @@ splunk:
             useACK: true
     - key: indexes
       # https://docs.splunk.com/Documentation/Splunk/latest/Admin/Indexesconf
-      value: 
+      value:
         directory: /opt/splunk/etc/system/local
-        content: 
-          custom_index: 
+        content:
+          custom_index:
             homePath: $SPLUNK_DB/custom_index/db
             coldPath: $SPLUNK_DB/custom_index/colddb
             thawedPath: $SPLUNK_DB/custom_index/thaweddb
diff --git a/scripts/integration/webhdfs/compose.yaml b/tests/integration/webhdfs/config/compose.yaml
similarity index 89%
rename from scripts/integration/webhdfs/compose.yaml
rename to tests/integration/webhdfs/config/compose.yaml
index 082816fd01e1f..f3b5a51519513 100644
--- a/scripts/integration/webhdfs/compose.yaml
+++ b/tests/integration/webhdfs/config/compose.yaml
@@ -10,7 +10,7 @@ services:
     environment:
       - CLUSTER_NAME=test
     env_file:
-      - ../../../tests/data/webhdfs/hadoop.env
+      - ../data/hadoop.env
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9870"]
       interval: 5s
@@ -24,7 +24,7 @@ services:
     environment:
       - SERVICE_PRECONDITION=namenode.local:9870
     env_file:
-      - ../../../tests/data/webhdfs/hadoop.env
+      - ../data/hadoop.env
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9864"]
       interval: 5s
diff --git a/scripts/integration/webhdfs/test.yaml b/tests/integration/webhdfs/config/test.yaml
similarity index 91%
rename from scripts/integration/webhdfs/test.yaml
rename to tests/integration/webhdfs/config/test.yaml
index fc6a3193f9139..f1bd9f88b2ff9 100644
--- a/scripts/integration/webhdfs/test.yaml
+++ b/tests/integration/webhdfs/config/test.yaml
@@ -14,4 +14,4 @@ matrix:
 paths:
 - "src/sinks/webhdfs/**"
 - "src/sinks/util/**"
-- "scripts/integration/webhdfs/**"
+- "tests/integration/webhdfs/**"
diff --git a/tests/data/webhdfs/hadoop.env b/tests/integration/webhdfs/data/hadoop.env
similarity index 100%
rename from tests/data/webhdfs/hadoop.env
rename to tests/integration/webhdfs/data/hadoop.env
diff --git a/vdev/src/commands/integration/mod.rs b/vdev/src/commands/integration/mod.rs
index b517fc475a5db..7fc2ea0ec071c 100644
--- a/vdev/src/commands/integration/mod.rs
+++ b/vdev/src/commands/integration/mod.rs
@@ -2,8 +2,8 @@ crate::cli_subcommands! {
     r"Manage integration test environments...
 
 These test setups are organized into a set of integrations, located in subdirectories
-`scripts/integration`.  For each integration, there is a matrix of environments, described in the
-`matrix` setting in the `test.yaml` file contained therein."
+`tests/integration`.  For each integration, there is a matrix of environments, described in the
+`matrix` setting in the `test.yaml` file contained in the `config/` subdirectory."
 
     mod show,
     mod build,
diff --git a/vdev/src/testing/config.rs b/vdev/src/testing/config.rs
index 68167838de2f2..facae0bb8a460 100644
--- a/vdev/src/testing/config.rs
+++ b/vdev/src/testing/config.rs
@@ -13,10 +13,22 @@ use serde_yaml::Value;
 use crate::{app, environment::Environment, util};
 
 const FILE_NAME: &str = "test.yaml";
+const CONFIG_SUBDIR: &str = "config";
 
 pub const INTEGRATION_TESTS_DIR: &str = "integration";
 pub const E2E_TESTS_DIR: &str = "e2e";
 
+/// Returns the base directory and whether to use config subdirectory for the given test type.
+/// Integration tests are in tests/integration with config/ subdirectories.
+/// E2E tests are in scripts/e2e without config/ subdirectories.
+fn test_dir_config(root_dir: &str) -> (&'static str, bool) {
+    if root_dir == INTEGRATION_TESTS_DIR {
+        ("tests", true)
+    } else {
+        ("scripts", false)
+    }
+}
+
 #[derive(Deserialize, Debug)]
 pub struct RustToolchainRootConfig {
     pub toolchain: RustToolchainConfig,
@@ -205,7 +217,9 @@ impl ComposeTestConfig {
     }
 
     pub fn load(root_dir: &str, integration: &str) -> Result<(PathBuf, Self)> {
-        let test_dir: PathBuf = [app::path(), "scripts", root_dir, integration]
+        let (base_dir, use_config_subdir) = test_dir_config(root_dir);
+
+        let test_dir: PathBuf = [app::path(), base_dir, root_dir, integration]
             .iter()
             .collect();
 
@@ -213,16 +227,30 @@ impl ComposeTestConfig {
             bail!("unknown integration: {}", integration);
         }
 
-        let config = Self::parse_file(&test_dir.join(FILE_NAME))?;
-        Ok((test_dir, config))
+        let config_dir = if use_config_subdir {
+            test_dir.join(CONFIG_SUBDIR)
+        } else {
+            test_dir.clone()
+        };
+        let config = Self::parse_file(&config_dir.join(FILE_NAME))?;
+        Ok((config_dir, config))
     }
 
-    fn collect_all_dir(tests_dir: &Path, configs: &mut BTreeMap<String, Self>) -> Result<()> {
+    fn collect_all_dir(
+        tests_dir: &Path,
+        configs: &mut BTreeMap<String, Self>,
+        use_config_subdir: bool,
+    ) -> Result<()> {
         for entry in tests_dir.read_dir()? {
             let entry = entry?;
             if entry.path().is_dir() {
-                let config_file: PathBuf =
-                    [entry.path().to_str().unwrap(), FILE_NAME].iter().collect();
+                let config_file: PathBuf = if use_config_subdir {
+                    [entry.path().to_str().unwrap(), CONFIG_SUBDIR, FILE_NAME]
+                        .iter()
+                        .collect()
+                } else {
+                    [entry.path().to_str().unwrap(), FILE_NAME].iter().collect()
+                };
                 if util::exists(&config_file)? {
                     let config = Self::parse_file(&config_file)?;
                     configs.insert(entry.file_name().into_string().unwrap(), config);
@@ -235,9 +263,10 @@ impl ComposeTestConfig {
     pub fn collect_all(root_dir: &str) -> Result<BTreeMap<String, Self>> {
         let mut configs = BTreeMap::new();
 
-        let tests_dir: PathBuf = [app::path(), "scripts", root_dir].iter().collect();
+        let (base_dir, use_config_subdir) = test_dir_config(root_dir);
+        let tests_dir: PathBuf = [app::path(), base_dir, root_dir].iter().collect();
 
-        Self::collect_all_dir(&tests_dir, &mut configs)?;
+        Self::collect_all_dir(&tests_dir, &mut configs, use_config_subdir)?;
 
         Ok(configs)
     }
diff --git a/vdev/src/testing/integration.rs b/vdev/src/testing/integration.rs
index ebab1320a99f2..f63c8fdb6366c 100644
--- a/vdev/src/testing/integration.rs
+++ b/vdev/src/testing/integration.rs
@@ -37,7 +37,7 @@ pub(crate) struct ComposeTestLocalConfig {
 }
 
 impl ComposeTestLocalConfig {
-    /// Integration tests are located in the `scripts/integration` dir,
+    /// Integration tests are located in the `tests/integration` dir,
     /// and are the full feature flag is `all-integration-tests`.
     pub(crate) fn integration() -> Self {
         Self {