diff --git a/Makefile.am b/Makefile.am
index 10fe49a..38dd8c9 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,15 +56,18 @@
 endif
 
 if WITH_PYTHON
-cross: precross
+crossfeature: precross
 	$(CROSS_PY) test/test.py --retry-count 3 --features .* --skip-known-failures --server $(CROSS_LANGS_COMMA_SEPARATED)
-	$(CROSS_PY) test/test.py --retry-count 3 --skip-known-failures --server $(CROSS_LANGS_COMMA_SEPARATED) --client $(CROSS_LANGS_COMMA_SEPARATED)
 else
 # feature test needs python build
-cross: precross
-	$(CROSS_PY) test/test.py -s --server $(CROSS_LANGS_COMMA_SEPARATED) --client $(CROSS_LANGS_COMMA_SEPARATED)
+crossfeature:
 endif
 
+cross-%: precross crossfeature
+	$(CROSS_PY) test/test.py --retry-count 3 --skip-known-failures --server $(CROSS_LANGS_COMMA_SEPARATED) --client $(CROSS_LANGS_COMMA_SEPARATED) --regex "$*"
+
+cross: cross-.*
+
 TIMES = 1 2 3
 fail: precross
 	$(CROSS_PY) test/test.py || true