diff --git a/test/Makefile.am b/test/Makefile.am
index 6dd71690071031ecf9fec8861500167ec9887556..2dbf4880f38c976eef1d0bce243c4e088fe9f398 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,7 +4,8 @@ TESTS = \
   ganeti.utils_unittest.py \
   ganeti.bdev_unittest.py \
   ganeti.ssh_unittest.py \
-  ganeti.locking_unittest.py
+  ganeti.locking_unittest.py \
+  ganeti.constants_unittest.py
 
 TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir)
 
diff --git a/test/ganeti.constants_unittest.py b/test/ganeti.constants_unittest.py
new file mode 100755
index 0000000000000000000000000000000000000000..ca0816109ed4b15ad693220151e3df7cab3a9f1f
--- /dev/null
+++ b/test/ganeti.constants_unittest.py
@@ -0,0 +1,45 @@
+#!/usr/bin/python
+#
+
+# Copyright (C) 2006, 2007, 2008 Google Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 0.0510-1301, USA.
+
+
+"""Script for unittesting the constants module"""
+
+
+import unittest
+
+from ganeti import constants
+
+
+class TestConstants(unittest.TestCase):
+  """Constants tests"""
+
+  def testConfigVersion(self):
+    self.failUnless(constants.CONFIG_MAJOR >= 0 and
+                    constants.CONFIG_MAJOR <= 99)
+    self.failUnless(constants.CONFIG_MINOR >= 0 and
+                    constants.CONFIG_MINOR <= 99)
+    self.failUnless(constants.CONFIG_REVISION >= 0 and
+                    constants.CONFIG_REVISION <= 9999)
+    self.failUnless(constants.CONFIG_VERSION >= 0 and
+                    constants.CONFIG_VERSION <= 99999999)
+
+
+if __name__ == '__main__':
+  unittest.main()