diff --git a/src/test/java/org/qortal/test/arbitrary/ArbitraryDataStoragePolicyTests.java b/src/test/java/org/qortal/test/arbitrary/ArbitraryDataStoragePolicyTests.java
index 8cc561e6..317a015a 100644
--- a/src/test/java/org/qortal/test/arbitrary/ArbitraryDataStoragePolicyTests.java
+++ b/src/test/java/org/qortal/test/arbitrary/ArbitraryDataStoragePolicyTests.java
@@ -32,10 +32,15 @@ import static org.junit.Assert.*;
 public class ArbitraryDataStoragePolicyTests extends Common {
 
     @Before
-    public void beforeTest() throws DataException {
+    public void beforeTest() throws DataException, InterruptedException {
         Common.useDefaultSettings();
         this.deleteListsDirectory();
         ArbitraryDataStorageManager.getInstance().start();
+
+        // Wait for storage space to be calculated
+        while (!ArbitraryDataStorageManager.getInstance().isStorageCapacityCalculated()) {
+            Thread.sleep(100L);
+        }
     }
 
     @After