diff --git a/test/integration/objectstore/__init__.py b/test/integration/objectstore/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/integration/objectstore_selection_job_conf.xml b/test/integration/objectstore/objectstore_selection_job_conf.xml
similarity index 100%
rename from test/integration/objectstore_selection_job_conf.xml
rename to test/integration/objectstore/objectstore_selection_job_conf.xml
diff --git a/test/integration/objectstore_selection_job_resource_parameters_conf.xml b/test/integration/objectstore/objectstore_selection_job_resource_parameters_conf.xml
similarity index 100%
rename from test/integration/objectstore_selection_job_resource_parameters_conf.xml
rename to test/integration/objectstore/objectstore_selection_job_resource_parameters_conf.xml
diff --git a/test/integration/test_objectstore_jobs.py b/test/integration/objectstore/test_objectstore_jobs.py
similarity index 100%
rename from test/integration/test_objectstore_jobs.py
rename to test/integration/objectstore/test_objectstore_jobs.py
diff --git a/test/integration/test_objectstore_selection.py b/test/integration/objectstore/test_objectstore_selection.py
similarity index 99%
rename from test/integration/test_objectstore_selection.py
rename to test/integration/objectstore/test_objectstore_selection.py
index a6f25eb8cf6..fcbe0aedcd2 100644
--- a/test/integration/test_objectstore_selection.py
+++ b/test/integration/objectstore/test_objectstore_selection.py
@@ -80,7 +80,6 @@ class ObjectStoreJobsIntegrationTestCase(integration_util.IntegrationTestCase):
         assert dynamic_s3 == files_dynamic_s3_count
 
     def test_tool_simple_constructs(self):
-
         with self.dataset_populator.test_history() as history_id:
 
             def _run_tool(tool_id, inputs):