diff --git a/InvenTree/InvenTree/apps.py b/InvenTree/InvenTree/apps.py
index 465dc2087b..aeddb714a0 100644
--- a/InvenTree/InvenTree/apps.py
+++ b/InvenTree/InvenTree/apps.py
@@ -6,7 +6,7 @@ from django.apps import AppConfig
 from django.core.exceptions import AppRegistryNotReady
 from django.conf import settings
 
-from InvenTree.ready import canAppAccessDatabase
+from InvenTree.ready import isInTestMode, canAppAccessDatabase
 import InvenTree.tasks
 
 
@@ -20,7 +20,9 @@ class InvenTreeConfig(AppConfig):
 
         if canAppAccessDatabase():
             self.start_background_tasks()
-            self.update_exchange_rates()
+
+            if not isInTestMode():
+                self.update_exchange_rates()
 
     def start_background_tasks(self):
 
@@ -95,5 +97,9 @@ class InvenTreeConfig(AppConfig):
             print("Exchange backend not found - updating")
             update = True
 
+        except:
+            # Some other error - potentially the tables are not ready yet
+            return
+
         if update:
             update_exchange_rates()
diff --git a/InvenTree/InvenTree/ready.py b/InvenTree/InvenTree/ready.py
index aa31fac947..5a4f1e9576 100644
--- a/InvenTree/InvenTree/ready.py
+++ b/InvenTree/InvenTree/ready.py
@@ -1,6 +1,17 @@
 import sys
 
 
+def isInTestMode():
+    """
+    Returns True if the database is in testing mode
+    """
+
+    if 'test' in sys.argv:
+        return True
+
+    return False
+
+
 def canAppAccessDatabase():
     """
     Returns True if the apps.py file can access database records.