diff --git a/.zuul.yaml b/.zuul.yaml
index a49bff3..70992e1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -12,6 +12,9 @@
 - project:
     templates:
       - docs-on-readthedocs
+      - openstack-python36-jobs
+      - openstack-python37-jobs
+      - openstack-cover-jobs
     vars:
       rtd_webhook_id: '86525'
       rtd_project_name: 'airship-spyglass'
diff --git a/Makefile b/Makefile
index c8fc65a..1ce50d4 100644
--- a/Makefile
+++ b/Makefile
@@ -45,11 +45,17 @@ run_images: run_spyglass
 run_spyglass: build_spyglass
 	tools/spyglass.sh --help
 
+.PHONY: tests
+tests: run_tests
+
 .PHONY: security
 security:
 	tox -e bandit
 
-# TODO (alexanderhughes) add tox -e py36 tests once implemented in Spyglass
+# Run all unit tests under spyglass
+.PHONY: run_tests
+run_tests:
+	tox -e py36
 
 # Perform Linting
 .PHONY: lint
diff --git a/tests/unit/validators/test_json_validator.py b/tests/unit/validators/test_json_validator.py
index e923e34..9299e80 100644
--- a/tests/unit/validators/test_json_validator.py
+++ b/tests/unit/validators/test_json_validator.py
@@ -56,7 +56,8 @@ def test_document_schema_matching():
     for pair in validator.document_schema_pairs:
         no_path_pairs.append(
             (os.path.split(pair[0])[1], os.path.split(pair[1])[1]))
-    assert no_path_pairs == expected_pairs
+    for pair in expected_pairs:
+        assert pair in no_path_pairs
 
 
 def test_document_schema_matching_no_files():