diff --git a/tests/test_form.py b/tests/test_form.py
new file mode 100644
index 0000000..99208ae
--- /dev/null
+++ b/tests/test_form.py
@@ -0,0 +1,25 @@
+from constance.admin import ConstanceForm
+from django.forms import fields
+from django.test import TestCase
+
+
+class TestForm(TestCase):
+
+    def test_form_field_types(self):
+
+        f = ConstanceForm({})
+
+        self.assertIsInstance(f.fields['INT_VALUE'], fields.IntegerField)
+        self.assertIsInstance(f.fields['LONG_VALUE'], fields.IntegerField)
+        self.assertIsInstance(f.fields['BOOL_VALUE'], fields.BooleanField)
+        self.assertIsInstance(f.fields['STRING_VALUE'], fields.CharField)
+        self.assertIsInstance(f.fields['UNICODE_VALUE'], fields.CharField)
+        self.assertIsInstance(f.fields['DECIMAL_VALUE'], fields.DecimalField)
+        self.assertIsInstance(f.fields['DATETIME_VALUE'], fields.SplitDateTimeField)
+        self.assertIsInstance(f.fields['FLOAT_VALUE'], fields.FloatField)
+        self.assertIsInstance(f.fields['DATE_VALUE'], fields.DateField)
+        self.assertIsInstance(f.fields['TIME_VALUE'], fields.TimeField)
+
+        # from CONSTANCE_ADDITIONAL_FIELDS
+        self.assertIsInstance(f.fields['CHOICE_VALUE'], fields.ChoiceField)
+        self.assertIsInstance(f.fields['EMAIL_VALUE'], fields.EmailField)