diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index b20d297e8f..25af46a9fa 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -221,6 +221,10 @@ jobs:
         image: quay.io/splunko11ytest/redis_server:latest
         ports:
           - "6379:6379"
+      solr:
+        image: quay.io/splunko11ytest/solr:latest
+        ports:
+          - "8983:8983"
     strategy:
       matrix:
         ARCH: [ "amd64", "arm64" ]
diff --git a/tests/receivers/smartagent/collectd-solr/testdata/server/Dockerfile b/docker/solr/Dockerfile
similarity index 100%
rename from tests/receivers/smartagent/collectd-solr/testdata/server/Dockerfile
rename to docker/solr/Dockerfile
diff --git a/tests/receivers/smartagent/collectd-solr/collectd_solr_test.go b/tests/receivers/smartagent/collectd-solr/collectd_solr_test.go
index 661016b357..47c1d078bd 100644
--- a/tests/receivers/smartagent/collectd-solr/collectd_solr_test.go
+++ b/tests/receivers/smartagent/collectd-solr/collectd_solr_test.go
@@ -17,21 +17,12 @@
 package tests
 
 import (
-	"path"
 	"testing"
 
 	"github.com/signalfx/splunk-otel-collector/tests/testutils"
 )
 
 func TestCollectdSolrReceiverProvidesAllMetrics(t *testing.T) {
-	containers := []testutils.Container{
-		testutils.NewContainer().WithContext(
-			path.Join(".", "testdata", "server"),
-		).WithExposedPorts("8983:8983").WithName(
-			"solr",
-		).WillWaitForPorts("8983").WillWaitForLogs("Time spent:"),
-	}
-
 	testutils.AssertAllMetricsReceived(
 		t, "all.yaml", "all_metrics_config.yaml", containers, nil,
 	)