diff --git a/test/integration/objectstore/objectstore_selection_job_conf.xml b/test/integration/objectstore/selection_job_conf.xml
similarity index 100%
rename from test/integration/objectstore/objectstore_selection_job_conf.xml
rename to test/integration/objectstore/selection_job_conf.xml
diff --git a/test/integration/objectstore/objectstore_selection_job_resource_parameters_conf.xml b/test/integration/objectstore/selection_job_resource_parameters_conf.xml
similarity index 100%
rename from test/integration/objectstore/objectstore_selection_job_resource_parameters_conf.xml
rename to test/integration/objectstore/selection_job_resource_parameters_conf.xml
diff --git a/test/integration/objectstore/test_objectstore_jobs.py b/test/integration/objectstore/test_jobs.py
similarity index 100%
rename from test/integration/objectstore/test_objectstore_jobs.py
rename to test/integration/objectstore/test_jobs.py
diff --git a/test/integration/objectstore/test_objectstore_selection.py b/test/integration/objectstore/test_selection.py
similarity index 97%
rename from test/integration/objectstore/test_objectstore_selection.py
rename to test/integration/objectstore/test_selection.py
index fcbe0aedcd2..da2576ecf97 100644
--- a/test/integration/objectstore/test_objectstore_selection.py
+++ b/test/integration/objectstore/test_selection.py
@@ -9,8 +9,8 @@ from base.populators import (
 )
 
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
-JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "objectstore_selection_job_conf.xml")
-JOB_RESOURCE_PARAMETERS_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "objectstore_selection_job_resource_parameters_conf.xml")
+JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "selection_job_conf.xml")
+JOB_RESOURCE_PARAMETERS_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "selection_job_resource_parameters_conf.xml")
 
 DISTRIBUTED_OBJECT_STORE_CONFIG_TEMPLATE = string.Template("""<?xml version="1.0"?>
 <object_store type="distributed" id="primary" order="0">