diff --git a/InvenTree/InvenTree/tests.py b/InvenTree/InvenTree/tests.py
index 2a3377c408..1f9c11e7fc 100644
--- a/InvenTree/InvenTree/tests.py
+++ b/InvenTree/InvenTree/tests.py
@@ -691,7 +691,7 @@ class TestSettings(helpers.InvenTreeTestCase):
 
         valid = [
             'inventree/config.yaml',
-            'inventree/dev/config.yaml',
+            'inventree/data/config.yaml',
         ]
 
         self.assertTrue(any([opt in config.get_config_file().lower() for opt in valid]))
@@ -706,7 +706,7 @@ class TestSettings(helpers.InvenTreeTestCase):
 
         valid = [
             'inventree/plugins.txt',
-            'inventree/dev/plugins.txt',
+            'inventree/data/plugins.txt',
         ]
 
         self.assertTrue(any([opt in config.get_plugin_file().lower() for opt in valid]))
diff --git a/tasks.py b/tasks.py
index 5161676321..80a8180b3b 100644
--- a/tasks.py
+++ b/tasks.py
@@ -406,7 +406,13 @@ def import_fixtures(c):
 
 
 # Execution tasks
-@task(help={'address': 'Server address:port (default=127.0.0.1:8000)'})
+@task
+def wait(c):
+    """Wait until the database connection is ready."""
+    return manage(c, "wait_for_db")
+
+
+@task(pre=[wait], help={'address': 'Server address:port (default=127.0.0.1:8000)'})
 def server(c, address="127.0.0.1:8000"):
     """Launch a (deveopment) server using Django's in-built webserver.
 
@@ -415,12 +421,6 @@ def server(c, address="127.0.0.1:8000"):
     manage(c, "runserver {address}".format(address=address), pty=True)
 
 
-@task
-def wait(c):
-    """Wait until the database connection is ready."""
-    return manage(c, "wait_for_db")
-
-
 @task(pre=[wait])
 def worker(c):
     """Run the InvenTree background worker process."""