diff --git a/.gitignore b/.gitignore
index 7da754e7a57892adfb7bebef60b889f01ab8c80b..6a78689e57a5a9d1423ac7150480329df2183a78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ node_modules/
 _build/
 .DS_Store
 dev.db
-
+.coverage
diff --git a/pinaxcon/registrasion/migrations/0001_initial.py b/pinaxcon/registrasion/migrations/0001_initial.py
index 4e83eceda65eed74ad943484c10e715186c94682..245a4dd8246fe6a0bfcbe9fb066ef8ff240d28ab 100644
--- a/pinaxcon/registrasion/migrations/0001_initial.py
+++ b/pinaxcon/registrasion/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-04-01 10:05
+# Generated by Django 1.9.2 on 2016-04-27 00:27
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('registrasion', '0011_auto_20160401_0943'),
+        ('registrasion', '0001_initial'),
     ]
 
     operations = [
@@ -31,4 +31,11 @@ class Migration(migrations.Migration):
             ],
             bases=('registrasion.attendeeprofilebase',),
         ),
+        migrations.CreateModel(
+            name='DemoPayment',
+            fields=[
+                ('paymentbase_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='registrasion.PaymentBase')),
+            ],
+            bases=('registrasion.paymentbase',),
+        ),
     ]
diff --git a/pinaxcon/registrasion/migrations/0002_demopayment.py b/pinaxcon/registrasion/migrations/0002_demopayment.py
deleted file mode 100644
index ccff847c1b73b682d90ab12e0305d7acd4723b47..0000000000000000000000000000000000000000
--- a/pinaxcon/registrasion/migrations/0002_demopayment.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-04-07 07:41
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('registrasion', '0013_auto_20160406_2228_squashed_0015_auto_20160406_1942'),
-        ('pinaxcon_registrasion', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='DemoPayment',
-            fields=[
-                ('paymentbase_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='registrasion.PaymentBase')),
-            ],
-            bases=('registrasion.paymentbase',),
-        ),
-    ]
diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index c157ca36648b65aa46f2b3d7494cb92a6c33c9cc..60e965617963433bc744470a90b0f1f443594231 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -163,6 +163,9 @@ INSTALLED_APPS = [
     "pinaxcon",
     "pinaxcon.proposals",
     "pinaxcon.registrasion",
+
+    #testing
+    "django_nose",
 ]
 
 # A sample logging configuration. The only tangible logging
@@ -221,3 +224,12 @@ PINAX_PAGES_HOOKSET = "pinaxcon.hooks.PinaxPagesHookSet"
 PINAX_BOXES_HOOKSET = "pinaxcon.hooks.PinaxBoxesHookSet"
 
 ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm"
+
+# Use nose to run all tests
+TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
+
+# Tell nose to measure coverage on the 'foo' and 'bar' apps
+NOSE_ARGS = [
+    '--with-coverage',
+    '--cover-package=registrasion.controllers,registrasion.models',
+]