diff --git a/src/metrics.js b/src/metrics.js
index d913af911..4917985f4 100644
--- a/src/metrics.js
+++ b/src/metrics.js
@@ -128,7 +128,8 @@ async function getCpuMetrics() {
 }
 
 async function sendToGraphite() {
-    debug('sendStatsToGraphite: collecting stats');
+    // debug('sendStatsToGraphite: collecting stats');
+
     const graphiteMetrics = [];
 
     const memoryMetrics = await getMemoryMetrics();
diff --git a/src/routes/test/common.js b/src/routes/test/common.js
index 38fd9a9f3..c507fbe0f 100644
--- a/src/routes/test/common.js
+++ b/src/routes/test/common.js
@@ -179,7 +179,6 @@ async function setup() {
 
 async function cleanup() {
     debug('Cleaning up');
-    await database._clear();
     await server.stop();
     await oidcServer.stop();
     debug('Cleaned up');
diff --git a/src/services.js b/src/services.js
index 36fb8d70e..c700b200b 100644
--- a/src/services.js
+++ b/src/services.js
@@ -506,6 +506,8 @@ async function rebuildService(id, auditSource) {
     assert.strictEqual(typeof id, 'string');
     assert.strictEqual(typeof auditSource, 'object');
 
+    if (constants.TEST && !process.env.TEST_CREATE_INFRA) return;
+
     // this attempts to recreate the service docker container if they don't exist but platform infra version is unchanged
     // passing an infra version of 'none' will not attempt to purge existing data
     const [name, instance] = id.split(':');