diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000..e2df5e0
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,2 @@
+[run]
+source = jsignature
diff --git a/.gitignore b/.gitignore
index 0d20b64..0680a75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 *.pyc
+.coverage
+htmlcov
diff --git a/.travis.yml b/.travis.yml
index 4343abc..bc9922a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,5 +10,6 @@ env:
 install:
   - pip install -r requirements.txt --use-mirrors
   - pip install -q Django==$DJANGO_VERSION --use-mirrors
+  - pip install coverage
 
-script: python quicktest.py jsignature
+script: coverage run quicktest.py jsignature
diff --git a/jsignature/tests/mixins.py b/jsignature/tests/mixins.py
index 517220a..92a349e 100644
--- a/jsignature/tests/mixins.py
+++ b/jsignature/tests/mixins.py
@@ -48,3 +48,11 @@ class JSignatureFieldsMixinTest(SimpleTestCase):
         i.save()
         i = JSignatureTestModel.objects.get(pk=i.pk)
         self.assertEqual(date.today(), i.signature_date.date())
+
+        # If sinature is set to None, it must be the same for signature_date
+        i = JSignatureTestModel(signature=signature_value)
+        i.save()
+        i.signature = None
+        i.save()
+        i = JSignatureTestModel.objects.get(pk=i.pk)
+        self.assertIsNone(i.signature_date)