diff --git a/docker-compose.yaml b/docker-compose.yaml
index 381400d81a..3343fcd6cf 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -32,7 +32,7 @@ services:
       TRACETEST_DATASTOREPIPELINES_TESTCONNECTION_ENABLED: ${TRACETEST_DATASTOREPIPELINES_TESTCONNECTION_ENABLED}
 
   postgres:
-    image: postgres:14
+    image: postgres:15.2
     environment:
       POSTGRES_PASSWORD: postgres
       POSTGRES_USER: postgres
diff --git a/server/testsuite/testsuite_repository.go b/server/testsuite/testsuite_repository.go
index 7ad72e7b4a..c56ffdeda0 100644
--- a/server/testsuite/testsuite_repository.go
+++ b/server/testsuite/testsuite_repository.go
@@ -273,7 +273,7 @@ func (r *Repository) Get(ctx context.Context, id id.ID) (TestSuite, error) {
 
 func (r *Repository) get(ctx context.Context, id id.ID, augmented bool) (TestSuite, error) {
 	query, params := sqlutil.TenantWithPrefix(ctx, querySelect()+" WHERE t.id = $1", "t.", id)
-	stmt, err := r.db.Prepare(query + "ORDER BY t.version DESC LIMIT 1")
+	stmt, err := r.db.Prepare(query + " ORDER BY t.version DESC LIMIT 1")
 	if err != nil {
 		return TestSuite{}, fmt.Errorf("prepare: %w", err)
 	}
diff --git a/testing/cli-e2etest/environment/jaeger/server-setup/docker-compose-no-api.yaml b/testing/cli-e2etest/environment/jaeger/server-setup/docker-compose-no-api.yaml
index 4b068a1e44..83f07dd82b 100644
--- a/testing/cli-e2etest/environment/jaeger/server-setup/docker-compose-no-api.yaml
+++ b/testing/cli-e2etest/environment/jaeger/server-setup/docker-compose-no-api.yaml
@@ -28,7 +28,7 @@ services:
       TRACETEST_DEV: ${TRACETEST_DEV}
 
   postgres:
-    image: postgres:14
+    image: postgres:15.2
     environment:
       POSTGRES_PASSWORD: postgres
       POSTGRES_USER: postgres
diff --git a/testing/load/infra/docker-compose.yaml b/testing/load/infra/docker-compose.yaml
index 69910c0c01..405b8bc61d 100644
--- a/testing/load/infra/docker-compose.yaml
+++ b/testing/load/infra/docker-compose.yaml
@@ -30,7 +30,7 @@ services:
       TRACETEST_DEV: ${TRACETEST_DEV}
 
   postgres:
-    image: postgres:14
+    image: postgres:15.2
     restart: unless-stopped
     environment:
       POSTGRES_PASSWORD: postgres