diff --git a/tardis/conftest.py b/tardis/conftest.py
index 9a2573861a0..ccb770370e0 100644
--- a/tardis/conftest.py
+++ b/tardis/conftest.py
@@ -153,8 +153,8 @@ def pytest_addoption(parser):
 
 
 @pytest.fixture(scope="session")
-def generate_reference(pytestconfig):
-    option = pytestconfig.getvalue("generate_reference")
+def generate_reference(request):
+    option = request.config.getoption("--generate-reference")
     if option is None:
         return False
     else:
@@ -162,8 +162,8 @@ def generate_reference(pytestconfig):
 
 
 @pytest.fixture(scope="session")
-def tardis_ref_path(pytestconfig):
-    tardis_ref_path = pytestconfig.getvalue("tardis_refdata")
+def tardis_ref_path(request):
+    tardis_ref_path = request.config.getoption("--tardis-refdata")
     if tardis_ref_path is None:
         pytest.skip("--tardis-refdata was not specified")
     else:
diff --git a/tardis/montecarlo/tests/test_packet_source.py b/tardis/montecarlo/tests/test_packet_source.py
index daaad32210f..010348c8d53 100644
--- a/tardis/montecarlo/tests/test_packet_source.py
+++ b/tardis/montecarlo/tests/test_packet_source.py
@@ -10,25 +10,28 @@
 
 @pytest.fixture
 def data_path():
-    return os.path.join(tardis.__path__[0], 'montecarlo', 'tests', 'data')
+    return os.path.join(tardis.__path__[0], "montecarlo", "tests", "data")
+
 
 @pytest.fixture
 def packet_unit_test_fpath(tardis_ref_path):
-    return os.path.abspath(os.path.join(
-        tardis_ref_path, 'packet_unittest.h5'))
+    return os.path.abspath(os.path.join(tardis_ref_path, "packet_unittest.h5"))
+
 
-def test_bb_packet_sampling(pytestconfig, tardis_ref_data, packet_unit_test_fpath):
+def test_bb_packet_sampling(request, tardis_ref_data, packet_unit_test_fpath):
     bb = BlackBodySimpleSource(2508)
-    #ref_df = pd.read_hdf('test_bb_sampling.h5')
-    if pytestconfig.getvalue("--generate-reference"):
-            ref_bb = pd.read_hdf(packet_unit_test_fpath, key='/blackbody')
-            ref_bb.to_hdf(tardis_ref_data, key='/packet_unittest/blackbody', 
-                            mode='a')
+    # ref_df = pd.read_hdf('test_bb_sampling.h5')
+    if request.config.getoption("--generate-reference"):
+        ref_bb = pd.read_hdf(packet_unit_test_fpath, key="/blackbody")
+        ref_bb.to_hdf(
+            tardis_ref_data, key="/packet_unittest/blackbody", mode="a"
+        )
 
-    ref_df = tardis_ref_data['/packet_unittest/blackbody']
+    ref_df = tardis_ref_data["/packet_unittest/blackbody"]
     nus = bb.create_blackbody_packet_nus(10000, 100)
     mus = bb.create_zero_limb_darkening_packet_mus(100)
     unif_energies = bb.create_uniform_packet_energies(100)
-    assert np.all(np.isclose(nus, ref_df['nus']))
-    assert np.all(np.isclose(mus, ref_df['mus']))
-    assert np.all(np.isclose(unif_energies, ref_df['energies']))
\ No newline at end of file
+    assert np.all(np.isclose(nus, ref_df["nus"]))
+    assert np.all(np.isclose(mus, ref_df["mus"]))
+    assert np.all(np.isclose(unif_energies, ref_df["energies"]))
+
diff --git a/tardis/plasma/tests/test_complete_plasmas.py b/tardis/plasma/tests/test_complete_plasmas.py
index fc5ffac6086..5a4556e7ecb 100644
--- a/tardis/plasma/tests/test_complete_plasmas.py
+++ b/tardis/plasma/tests/test_complete_plasmas.py
@@ -157,12 +157,10 @@ def config(self, request):
         return config
 
     @pytest.fixture(scope="class")
-    def plasma(
-        self, pytestconfig, chianti_he_db_fpath, config, tardis_ref_data
-    ):
+    def plasma(self, request, chianti_he_db_fpath, config, tardis_ref_data):
         config["atom_data"] = chianti_he_db_fpath
         sim = Simulation.from_config(config)
-        if pytestconfig.getvalue("--generate-reference"):
+        if request.config.getoption("--generate-reference"):
             sim.plasma.to_hdf(tardis_ref_data, path=config.plasma.save_path)
             pytest.skip("Reference data saved at {0}".format(tardis_ref_data))
         return sim.plasma
diff --git a/tardis/tests/integration_tests/test_integration.py b/tardis/tests/integration_tests/test_integration.py
index 9c21a7c30a9..c2719558416 100644
--- a/tardis/tests/integration_tests/test_integration.py
+++ b/tardis/tests/integration_tests/test_integration.py
@@ -71,18 +71,18 @@ def model_quantities(request):
 @pytest.mark.integration
 class TestIntegration(object):
     """Slow integration test for various setups present in subdirectories of
-    ``tardis/tests/integration_tests``.
+    ``tardis/tests/integration_tests``.	
     """
 
     @classmethod
     @pytest.fixture(scope="class", autouse=True)
-    def setup(self, request, reference, data_path, pytestconfig):
+    def setup(self, request, reference, data_path):
         """
         This method does initial setup of creating configuration and performing
         a single run of integration test.
         """
         # Get capture manager
-        capmanager = pytestconfig.pluginmanager.getplugin("capturemanager")
+        capmanager = request.config.pluginmanager.getplugin("capturemanager")
 
         # The last component in dirpath can be extracted as name of setup.
         self.name = data_path["setup_name"]