diff --git a/Makefile b/Makefile
index 32e57404f..bd08afc79 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,7 @@ coverage:
 	coverage run -m unittest discover -v -k testann -s ${TEST_DIR}
 	coverage run -m unittest discover -v -k testapi.testauthorization -k testapi.testcluster -s ${TEST_DIR}
 	coverage run -m unittest discover -v -k testapi.testencoding -k testapi.testextension -s ${TEST_DIR}
+	coverage run -m unittest discover -v -k testapi.testpipelines -s ${TEST_DIR}
 	coverage run -m unittest discover -v -k testapp -s ${TEST_DIR}
 	coverage run -m unittest discover -v -k testarchive -s ${TEST_DIR}
 	coverage run -m unittest discover -v -k testcloud -s ${TEST_DIR}
@@ -44,7 +45,8 @@ coverage:
 	coverage run -m unittest discover -v -k testgraph -s ${TEST_DIR}
 	coverage run -m unittest discover -v -k testmodels -s ${TEST_DIR}
 	coverage run -m unittest discover -v -k testoptional -s ${TEST_DIR}
-	coverage run -m unittest discover -v -k testpipeline -s ${TEST_DIR}
+	coverage run -m unittest discover -v -k testpipeline.testaudio -k testpipeline.testdata -k testpipeline.testimage -s ${TEST_DIR}
+	coverage run -m unittest discover -v -k testpipeline.testllm -k testpipeline.testtext -k testpipeline.testtrain -s ${TEST_DIR}
 	coverage run -m unittest discover -v -k testscoring -s ${TEST_DIR}
 	coverage run -m unittest discover -v -k testserialize -s ${TEST_DIR}
 	coverage run -m unittest discover -v -k testvectors -s ${TEST_DIR}
diff --git a/test/python/testpipeline/testaudio/__init__.py b/test/python/testpipeline/testaudio/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/python/testpipeline/testaudiomixer.py b/test/python/testpipeline/testaudio/testaudiomixer.py
similarity index 100%
rename from test/python/testpipeline/testaudiomixer.py
rename to test/python/testpipeline/testaudio/testaudiomixer.py
diff --git a/test/python/testpipeline/testaudiostream.py b/test/python/testpipeline/testaudio/testaudiostream.py
similarity index 100%
rename from test/python/testpipeline/testaudiostream.py
rename to test/python/testpipeline/testaudio/testaudiostream.py
diff --git a/test/python/testpipeline/testmicrophone.py b/test/python/testpipeline/testaudio/testmicrophone.py
similarity index 100%
rename from test/python/testpipeline/testmicrophone.py
rename to test/python/testpipeline/testaudio/testmicrophone.py
diff --git a/test/python/testpipeline/testtexttoaudio.py b/test/python/testpipeline/testaudio/testtexttoaudio.py
similarity index 100%
rename from test/python/testpipeline/testtexttoaudio.py
rename to test/python/testpipeline/testaudio/testtexttoaudio.py
diff --git a/test/python/testpipeline/testtexttospeech.py b/test/python/testpipeline/testaudio/testtexttospeech.py
similarity index 100%
rename from test/python/testpipeline/testtexttospeech.py
rename to test/python/testpipeline/testaudio/testtexttospeech.py
diff --git a/test/python/testpipeline/testtranscription.py b/test/python/testpipeline/testaudio/testtranscription.py
similarity index 100%
rename from test/python/testpipeline/testtranscription.py
rename to test/python/testpipeline/testaudio/testtranscription.py
diff --git a/test/python/testpipeline/testdata/__init__.py b/test/python/testpipeline/testdata/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/python/testpipeline/testtabular.py b/test/python/testpipeline/testdata/testtabular.py
similarity index 100%
rename from test/python/testpipeline/testtabular.py
rename to test/python/testpipeline/testdata/testtabular.py
diff --git a/test/python/testpipeline/testtextractor.py b/test/python/testpipeline/testdata/testtextractor.py
similarity index 100%
rename from test/python/testpipeline/testtextractor.py
rename to test/python/testpipeline/testdata/testtextractor.py
diff --git a/test/python/testpipeline/testtokenizer.py b/test/python/testpipeline/testdata/testtokenizer.py
similarity index 100%
rename from test/python/testpipeline/testtokenizer.py
rename to test/python/testpipeline/testdata/testtokenizer.py
diff --git a/test/python/testpipeline/testimage/__init__.py b/test/python/testpipeline/testimage/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/python/testpipeline/testcaption.py b/test/python/testpipeline/testimage/testcaption.py
similarity index 100%
rename from test/python/testpipeline/testcaption.py
rename to test/python/testpipeline/testimage/testcaption.py
diff --git a/test/python/testpipeline/testimagehash.py b/test/python/testpipeline/testimage/testimagehash.py
similarity index 100%
rename from test/python/testpipeline/testimagehash.py
rename to test/python/testpipeline/testimage/testimagehash.py
diff --git a/test/python/testpipeline/testobjects.py b/test/python/testpipeline/testimage/testobjects.py
similarity index 100%
rename from test/python/testpipeline/testobjects.py
rename to test/python/testpipeline/testimage/testobjects.py
diff --git a/test/python/testpipeline/testllm/__init__.py b/test/python/testpipeline/testllm/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/python/testpipeline/testgenerator.py b/test/python/testpipeline/testllm/testgenerator.py
similarity index 100%
rename from test/python/testpipeline/testgenerator.py
rename to test/python/testpipeline/testllm/testgenerator.py
diff --git a/test/python/testpipeline/testlitellm.py b/test/python/testpipeline/testllm/testlitellm.py
similarity index 100%
rename from test/python/testpipeline/testlitellm.py
rename to test/python/testpipeline/testllm/testlitellm.py
diff --git a/test/python/testpipeline/testllama.py b/test/python/testpipeline/testllm/testllama.py
similarity index 100%
rename from test/python/testpipeline/testllama.py
rename to test/python/testpipeline/testllm/testllama.py
diff --git a/test/python/testpipeline/testllm.py b/test/python/testpipeline/testllm/testllm.py
similarity index 100%
rename from test/python/testpipeline/testllm.py
rename to test/python/testpipeline/testllm/testllm.py
diff --git a/test/python/testpipeline/testrag.py b/test/python/testpipeline/testllm/testrag.py
similarity index 100%
rename from test/python/testpipeline/testrag.py
rename to test/python/testpipeline/testllm/testrag.py
diff --git a/test/python/testpipeline/testsequences.py b/test/python/testpipeline/testllm/testsequences.py
similarity index 100%
rename from test/python/testpipeline/testsequences.py
rename to test/python/testpipeline/testllm/testsequences.py
diff --git a/test/python/testpipeline/testtext/__init__.py b/test/python/testpipeline/testtext/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/python/testpipeline/testentity.py b/test/python/testpipeline/testtext/testentity.py
similarity index 100%
rename from test/python/testpipeline/testentity.py
rename to test/python/testpipeline/testtext/testentity.py
diff --git a/test/python/testpipeline/testlabels.py b/test/python/testpipeline/testtext/testlabels.py
similarity index 100%
rename from test/python/testpipeline/testlabels.py
rename to test/python/testpipeline/testtext/testlabels.py
diff --git a/test/python/testpipeline/testsummary.py b/test/python/testpipeline/testtext/testsummary.py
similarity index 100%
rename from test/python/testpipeline/testsummary.py
rename to test/python/testpipeline/testtext/testsummary.py
diff --git a/test/python/testpipeline/testtranslation.py b/test/python/testpipeline/testtext/testtranslation.py
similarity index 100%
rename from test/python/testpipeline/testtranslation.py
rename to test/python/testpipeline/testtext/testtranslation.py
diff --git a/test/python/testpipeline/testtrain/__init__.py b/test/python/testpipeline/testtrain/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/python/testpipeline/testonnx.py b/test/python/testpipeline/testtrain/testonnx.py
similarity index 100%
rename from test/python/testpipeline/testonnx.py
rename to test/python/testpipeline/testtrain/testonnx.py
diff --git a/test/python/testpipeline/testquantization.py b/test/python/testpipeline/testtrain/testquantization.py
similarity index 100%
rename from test/python/testpipeline/testquantization.py
rename to test/python/testpipeline/testtrain/testquantization.py
diff --git a/test/python/testpipeline/testtrainer.py b/test/python/testpipeline/testtrain/testtrainer.py
similarity index 100%
rename from test/python/testpipeline/testtrainer.py
rename to test/python/testpipeline/testtrain/testtrainer.py