diff --git a/setup.py b/setup.py
index b1b553ac..a2307ad7 100644
--- a/setup.py
+++ b/setup.py
@@ -5,6 +5,10 @@
 with open("README.rst", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
+so3g_etxras = ["so3g"]
+dev_extras = ["pytest", "pytest-twisted", "pytest-docker-compose", "pytest-cov", "coverage", "docker"]
+dev_extras.extend(so3g_etxras)
+
 setup(name='ocs',
       description='Observatory Control System',
       long_description=long_description,
@@ -50,6 +54,7 @@
           'numpy',
       ],
       extras_require={
-          "so3g": ["so3g"],
+          "so3g": so3g_etxras,
+          "dev": dev_extras,
       },
       )
diff --git a/tests/test_aggregator.py b/tests/test_aggregator.py
index f874f58d..8fe52fa9 100644
--- a/tests/test_aggregator.py
+++ b/tests/test_aggregator.py
@@ -424,7 +424,6 @@ def test_make_filename_directory_creation_no_subdirs(tmpdir):
         make_filename(test_dir, make_subdirs=False)
 
 
-@patch('os.makedirs', side_effect=PermissionError('mocked permission error'))
 def test_make_filename_directory_creation_permissions(tmpdir):
     """make_filename() should raise a PermissionError if it runs into one when
     making the directories.
@@ -433,6 +432,7 @@ def test_make_filename_directory_creation_permissions(tmpdir):
 
     """
     test_dir = os.path.join(tmpdir, 'data')
-    with pytest.raises(PermissionError) as e_info:
-        make_filename(test_dir)
-    assert str(e_info.value) == 'mocked permission error'
+    with patch('os.makedirs', side_effect=PermissionError('mocked permission error')):
+        with pytest.raises(PermissionError) as e_info:
+            make_filename(test_dir)
+        assert str(e_info.value) == 'mocked permission error'
diff --git a/tests/test_ocs_agent.py b/tests/test_ocs_agent.py
index d300276c..e6c1a83f 100644
--- a/tests/test_ocs_agent.py
+++ b/tests/test_ocs_agent.py
@@ -50,6 +50,7 @@ def mock_agent():
     """
     mock_config = MagicMock()
     mock_site_args = MagicMock()
+    mock_site_args.working_dir = "./"
     mock_site_args.log_dir = "./"
     a = OCSAgent(mock_config, mock_site_args, address='test.address')
     return a