diff --git a/.gitignore b/.gitignore
index 9c9a45d136..f55e48a348 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@ docs/_build
 inventree_media
 inventree_static
 static_i18n
+inventree-data
 
 # Local config file
 config.yaml
diff --git a/.gitpod.yml b/.gitpod.yml
index 1cc823a74f..4672cd7bd1 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -10,29 +10,21 @@ tasks:
       python3 -m venv venv
       source venv/bin/activate
       pip install invoke
-      inv install
       mkdir dev
-      inv update
-      gp sync-done setup_server
+      inv test-setup
+      gp sync-done start_server
 
  - name: Start server
-   init: gp sync-await setup_server
+   init: gp sync-await start_server
    command: |
-      gp sync-await setup_server
+      gp sync-await start_server
       export INVENTREE_DB_ENGINE='sqlite3'
       export INVENTREE_DB_NAME='/workspace/InvenTree/dev/database.sqlite3'
       export INVENTREE_MEDIA_ROOT='/workspace/InvenTree/inventree-data/media'
       export INVENTREE_STATIC_ROOT='/workspace/InvenTree/dev/static'
 
-      source venv/bin/activate
-      rm /workspace/InvenTree/inventree-data -r
-      git clone https://github.com/inventree/demo-dataset /workspace/InvenTree/inventree-data
-      invoke delete-data -f
-      invoke import-records -f /workspace/InvenTree/inventree-data/inventree_data.json
-
       inv server
 
-# List the ports to expose. Learn more https://www.gitpod.io/docs/config-ports/
 ports:
   - port: 8000
     onOpen: open-preview
diff --git a/tasks.py b/tasks.py
index 80a8180b3b..d8eac3b1c6 100644
--- a/tasks.py
+++ b/tasks.py
@@ -511,6 +511,19 @@ def test(c, database=None):
     manage(c, 'test', pty=True)
 
 
+@task(pre=[update])
+def setup_test(c):
+    """Setup a testing enviroment."""
+    # Remove old data directory
+    c.run('rm inventree-data -r')
+
+    # Get test data
+    c.run('git clone https://github.com/inventree/demo-dataset inventree-data')
+
+    # Load data
+    import_records(c, filename='inventree-data/inventree_data.json', clear=True)
+
+
 @task
 def coverage(c):
     """Run code-coverage of the InvenTree codebase, using the 'coverage' code-analysis tools.