Fix integration tests skip condition

tardis/conftest.py

@@ -155,6 +155,11 @@ def tardis_ref_path():
     else:
         return os.path.expandvars(os.path.expanduser(tardis_ref_path))
 
+@pytest.fixture(scope='session')
+def integration_tests():
+    if not pytest.config.getvalue('integration-tests'):
+        pytest.skip('integration tests are not included in this run')
+
 from tardis.tests.fixtures.atom_data import *
 
 @pytest.yield_fixture(scope="session")

tardis/tests/integration_tests/test_integration.py

@@ -58,8 +58,6 @@ def model_quantities(request):
     return request.param
 
 
-@pytest.mark.skipif(not pytest.config.getvalue("integration-tests"),
-                    reason="integration tests are not included in this run")
 @pytest.mark.integration
 class TestIntegration(object):
     """Slow integration test for various setups present in subdirectories of
@@ -68,7 +66,7 @@ class TestIntegration(object):
 
     @classmethod
     @pytest.fixture(scope="class", autouse=True)
-    def setup(self, request, reference, data_path, pytestconfig):
+    def setup(self, request, reference, data_path, pytestconfig, integration_tests):
         """
         This method does initial setup of creating configuration and performing
         a single run of integration test.