diff --git a/.github/workflows/test-spec.yml b/.github/workflows/test-spec.yml
index 2a1c4ea80..98098bcf9 100644
--- a/.github/workflows/test-spec.yml
+++ b/.github/workflows/test-spec.yml
@@ -55,6 +55,8 @@ jobs:
             tests: plugins/workload-management
           - version: 2.19.0
             tests: plugins/analysis
+          - version: 2.19.0
+            tests: plugins/knn
           - version: 2.19.0
             tests: plugins/security
             cert: tests/plugins/security/.kirk.pem
diff --git a/tests/plugins/knn/docker-compose.yml b/tests/plugins/knn/docker-compose.yml
new file mode 100644
index 000000000..04c267ec5
--- /dev/null
+++ b/tests/plugins/knn/docker-compose.yml
@@ -0,0 +1,12 @@
+version: '3'
+
+services:
+  opensearch-cluster:
+    image: ${OPENSEARCH_DOCKER_HUB_PROJECT:-opensearchproject}/opensearch:${OPENSEARCH_VERSION:-latest}${OPENSEARCH_DOCKER_REF}
+    ports:
+      - 9200:9200
+      - 9600:9600
+    environment:
+      - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_PASSWORD:-myStrongPassword123!}
+      - OPENSEARCH_JAVA_OPTS=${OPENSEARCH_JAVA_OPTS}
+      - discovery.type=single-node
diff --git a/tests/default/knn/models.yaml b/tests/plugins/knn/knn/models.yaml
similarity index 96%
rename from tests/default/knn/models.yaml
rename to tests/plugins/knn/knn/models.yaml
index 17409c4d8..d94fcf797 100644
--- a/tests/default/knn/models.yaml
+++ b/tests/plugins/knn/knn/models.yaml
@@ -1,4 +1,4 @@
-$schema: ../../../json_schemas/test_story.schema.yaml
+$schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Delete a k-NN model.
 version: '>= 2.17'
diff --git a/tests/default/knn/models/search.yaml b/tests/plugins/knn/knn/models/search.yaml
similarity index 97%
rename from tests/default/knn/models/search.yaml
rename to tests/plugins/knn/knn/models/search.yaml
index a67bac7e6..1bc312cb5 100644
--- a/tests/default/knn/models/search.yaml
+++ b/tests/plugins/knn/knn/models/search.yaml
@@ -1,4 +1,4 @@
-$schema: ../../../../json_schemas/test_story.schema.yaml
+$schema: ../../../../../json_schemas/test_story.schema.yaml
 
 description: Search for a k-NN model.
 version: '>= 2.17'
diff --git a/tests/default/knn/models/train.yaml b/tests/plugins/knn/knn/models/train.yaml
similarity index 98%
rename from tests/default/knn/models/train.yaml
rename to tests/plugins/knn/knn/models/train.yaml
index 91fe9e787..a80b442cf 100644
--- a/tests/default/knn/models/train.yaml
+++ b/tests/plugins/knn/knn/models/train.yaml
@@ -1,4 +1,4 @@
-$schema: ../../../../json_schemas/test_story.schema.yaml
+$schema: ../../../../../json_schemas/test_story.schema.yaml
 
 description: Train a k-NN model with disk-based parameters.
 version: '>= 2.17'
diff --git a/tests/default/knn/stats.yaml b/tests/plugins/knn/knn/stats.yaml
similarity index 92%
rename from tests/default/knn/stats.yaml
rename to tests/plugins/knn/knn/stats.yaml
index f1fb9c5c9..65e0ff6df 100644
--- a/tests/default/knn/stats.yaml
+++ b/tests/plugins/knn/knn/stats.yaml
@@ -1,4 +1,4 @@
-$schema: ../../../json_schemas/test_story.schema.yaml
+$schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Get k-NN stats.
 chapters:
diff --git a/tests/default/knn/warmup.yaml b/tests/plugins/knn/knn/warmup.yaml
similarity index 91%
rename from tests/default/knn/warmup.yaml
rename to tests/plugins/knn/knn/warmup.yaml
index 656e67ee6..937ff2f38 100644
--- a/tests/default/knn/warmup.yaml
+++ b/tests/plugins/knn/knn/warmup.yaml
@@ -1,4 +1,4 @@
-$schema: ../../../json_schemas/test_story.schema.yaml
+$schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Load all the native library files for all the shards into native memory.
 prologues: