diff --git a/.travis.yml b/.travis.yml
index 124ed02da0..37ad7c425c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,8 @@ addons:
         -sqlite3
 
 before_install:
-    - make setup
+    - make install
+    - make migrate
 
 script:
     - make coverage
diff --git a/InvenTree/part/migrations/0011_auto_20190428_0841.py b/InvenTree/part/migrations/0011_auto_20190428_0841.py
new file mode 100644
index 0000000000..0146b6795a
--- /dev/null
+++ b/InvenTree/part/migrations/0011_auto_20190428_0841.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2 on 2019-04-27 22:41
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('part', '0010_auto_20190417_0045'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='supplierpart',
+            name='supplier',
+            field=models.ForeignKey(limit_choices_to={'is_supplier': True}, on_delete=django.db.models.deletion.CASCADE, related_name='parts', to='company.Company'),
+        ),
+    ]
diff --git a/InvenTree/stock/migrations/0009_auto_20190428_0841.py b/InvenTree/stock/migrations/0009_auto_20190428_0841.py
new file mode 100644
index 0000000000..4e22dad76b
--- /dev/null
+++ b/InvenTree/stock/migrations/0009_auto_20190428_0841.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2 on 2019-04-27 22:41
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stock', '0008_auto_20190417_1819'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='stockitem',
+            name='location',
+            field=models.ForeignKey(blank=True, help_text='Where is this stock item located?', null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='stock_items', to='stock.StockLocation'),
+        ),
+    ]
diff --git a/Makefile b/Makefile
index d675749c5c..38081570e4 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,8 @@ install:
 	pip install -U -r requirements.txt
 	python InvenTree/keygen.py
 
-setup: install migrate
+superuser:
+	python InvenTree/manage.py createsuperuser
 
 style:
 	flake8 InvenTree
@@ -37,5 +38,3 @@ documentation:
 	pip install -U -r docs/requirements.txt
 	cd docs & make html
 
-superuser:
-	python InvenTree/manage.py createsuperuser