diff --git a/VERSION b/VERSION
index 6d492717..2e40603d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.4.6-stable+timestamp.2013.04.15.15.58.57
+Version 2.4.6-stable+timestamp.2013.04.15.17.18.31
diff --git a/gluon/tests/test_old_doctests.py b/gluon/tests/test_old_doctests.py
new file mode 100644
index 00000000..2a7fc54b
--- /dev/null
+++ b/gluon/tests/test_old_doctests.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+""" Unit tests for old doctests in validators.py, utf8.py, html.py.
+    Don't abuse doctests, web2py > 2.4.5 will accept only unittests
+"""
+import sys
+import os
+if os.path.isdir('gluon'):
+    sys.path.append(os.path.realpath('gluon'))
+else:
+    sys.path.append(os.path.realpath('../'))
+
+import unittest
+import doctest
+               
+def load_tests(loader, tests, ignore):
+
+    tests.addTests(
+        doctest.DocTestSuite('validators',
+            optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
+        )
+    )
+    tests.addTests(
+        doctest.DocTestSuite('html')
+        )
+    tests.addTests(
+        doctest.DocTestSuite('utf8')
+        )
+    return tests
+
+if __name__ == '__main__':
+    unittest.main()