diff --git a/src/test/java/org/qortal/test/common/Common.java b/src/test/java/org/qortal/test/common/Common.java
index 3270a795..bb6cc1cb 100644
--- a/src/test/java/org/qortal/test/common/Common.java
+++ b/src/test/java/org/qortal/test/common/Common.java
@@ -120,7 +120,9 @@ public class Common {
 	}
 
 	public static void useSettingsAndDb(String settingsFilename, boolean dbInMemory) throws DataException {
-		closeRepository();
+		if (RepositoryManager.getRepositoryFactory() != null) {
+			closeRepository();
+		}
 
 		// Load/check settings, which potentially sets up blockchain config, etc.
 		LOGGER.debug(String.format("Using setting file: %s", settingsFilename));