diff --git a/AUTHORS b/AUTHORS
index 7788139..e16f23e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,6 +9,7 @@ Steve Challis <steve@stevechallis.com>
 Wilson Júnior <wilsonpjunior@gmail.com>
 Dan Crosta https://github.com/dcrosta
 Laine Herron https://github.com/LaineHerron
+Thomas Steinacher http://thomasst.ch/
 
 CONTRIBUTORS
 
@@ -114,7 +115,6 @@ that much better:
  * Alexander Koshelev
  * Jaime Irurzun
  * Alexandre González
- * Thomas Steinacher
  * Tommi Komulainen
  * Peter Landry
  * biszkoptwielki
@@ -169,4 +169,4 @@ that much better:
  * Massimo Santini (https://github.com/mapio)
  * Nigel McNie (https://github.com/nigelmcnie)
  * ygbourhis (https://github.com/ygbourhis)
- * Bob Dickinson (https://github.com/BobDickinson)
\ No newline at end of file
+ * Bob Dickinson (https://github.com/BobDickinson)
diff --git a/setup.py b/setup.py
index 7a9f360..effb6f1 100644
--- a/setup.py
+++ b/setup.py
@@ -51,14 +51,13 @@ CLASSIFIERS = [
 extra_opts = {}
 if sys.version_info[0] == 3:
     extra_opts['use_2to3'] = True
-    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'jinja2>=2.6']
+    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'jinja2==2.6']
     extra_opts['packages'] = find_packages(exclude=('tests',))
     if "test" in sys.argv or "nosetests" in sys.argv:
         extra_opts['packages'].append("tests")
         extra_opts['package_data'] = {"tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]}
 else:
-    #extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'django>=1.4.2', 'PIL', 'jinja2>=2.6']
-    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'jinja2>=2.6']
+    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'django>=1.4.2', 'PIL', 'jinja2==2.6', 'python-dateutil']
     extra_opts['packages'] = find_packages(exclude=('tests',))
 
 setup(name='mongoengine',