diff --git a/tests/regressiontests/forms/localflavor/kw.py b/tests/regressiontests/forms/localflavor/kw.py
index 265c1f00ae..af998bd34b 100644
--- a/tests/regressiontests/forms/localflavor/kw.py
+++ b/tests/regressiontests/forms/localflavor/kw.py
@@ -1,15 +1,16 @@
-# -*- coding: utf-8 -*-
-# Tests for the contrib/localflavor/ KW form fields.
+from django.contrib.localflavor.kw.forms import KWCivilIDNumberField
 
-tests = r"""
-# KWCivilIDNumberField ########################################################
+from utils import LocalFlavorTestCase
+
+
+class KWLocalFlavorTests(LocalFlavorTestCase):
+    def test_KWCivilIDNumberField(self):
+        error_invalid = [u'Enter a valid Kuwaiti Civil ID number']
+        valid = {
+            '282040701483': '282040701483',
+        }
+        invalid = {
+            '289332013455': error_invalid,
+        }
+        self.assertFieldOutput(KWCivilIDNumberField, valid, invalid)
 
->>> from django.contrib.localflavor.kw.forms import KWCivilIDNumberField
->>> f = KWCivilIDNumberField()
->>> f.clean('282040701483')
-'282040701483'
->>> f.clean('289332013455')
-Traceback (most recent call last):
-...
-ValidationError: [u'Enter a valid Kuwaiti Civil ID number']
-"""
diff --git a/tests/regressiontests/forms/localflavortests.py b/tests/regressiontests/forms/localflavortests.py
index 19b9700e7a..d8e5536439 100644
--- a/tests/regressiontests/forms/localflavortests.py
+++ b/tests/regressiontests/forms/localflavortests.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from localflavor.cz import tests as localflavor_cz_tests
-from localflavor.kw import tests as localflavor_kw_tests
 from localflavor.nl import tests as localflavor_nl_tests
 from localflavor.pl import tests as localflavor_pl_tests
 from localflavor.pt import tests as localflavor_pt_tests
@@ -30,11 +29,11 @@ from localflavor.ie import IELocalFlavorTests
 from localflavor.is_ import ISLocalFlavorTests
 from localflavor.it import ITLocalFlavorTests
 from localflavor.jp import JPLocalFlavorTests
+from localflavor.kw import KWLocalFlavorTests
 
 
 __test__ = {
     'localflavor_cz_tests': localflavor_cz_tests,
-    'localflavor_kw_tests': localflavor_kw_tests,
     'localflavor_nl_tests': localflavor_nl_tests,
     'localflavor_pl_tests': localflavor_pl_tests,
     'localflavor_pt_tests': localflavor_pt_tests,
diff --git a/tests/regressiontests/forms/tests/__init__.py b/tests/regressiontests/forms/tests/__init__.py
index 26af6b51fc..c0663cc7e9 100644
--- a/tests/regressiontests/forms/tests/__init__.py
+++ b/tests/regressiontests/forms/tests/__init__.py
@@ -30,4 +30,5 @@ from regressiontests.forms.localflavortests import (
     ISLocalFlavorTests,
     ITLocalFlavorTests,
     JPLocalFlavorTests,
+    KWLocalFlavorTests,
 )