diff --git a/jenkins-x.yml b/jenkins-x.yml
index 8b01dd2e86..4c4a9345d2 100644
--- a/jenkins-x.yml
+++ b/jenkins-x.yml
@@ -23,15 +23,30 @@ pipelineConfig:
             sh: "./add-pr-build-comment"
         - name: build-and-test
           parallel:
-          - name: test-python
-            steps:
-            - name: test-python
-              command: make
-              args:
-              - -C python
-              - update_package
-              - install_dev
-              - test
+          - name: test-python-all
+            command: make
+            args:
+            - -C python
+            - update_package
+            - install_dev
+            - test
+            - TOX_TEST=all
+          - name: test-python-all
+            command: make
+            args:
+            - -C python
+            - update_package
+            - install_dev
+            - test
+            - TOX_TEST=gcs
+          - name: test-python-all
+            command: make
+            args:
+            - -C python
+            - update_package
+            - install_dev
+            - test
+            - TOX_TEST=tensorflow
           - name: seldon-operator
             steps:
             - name: test-operator
diff --git a/python/Makefile b/python/Makefile
index 96728a0642..5435ba1f48 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -1,6 +1,8 @@
 SELDON_CORE_DIR=..
 VERSION := $(shell cat ../version.txt)
 
+TOX_TEST := "all" # Specify which tox test run when running python tests
+
 .PHONY: get_apis
 get_apis:
 	# Protobuf
@@ -65,13 +67,12 @@ uninstall:
 
 .PHONY: test
 test:
-	tox
+	tox $(TOX_TEST)
 
 .PHONY: type_check
 type_check:
 	mypy --ignore-missing-imports --no-strict-optional seldon_core
 
-.PHONY: build_pypi
 build_pypi:
 	python setup.py sdist bdist_wheel