diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 0370fa9a236..2938a566d0a 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -729,8 +729,12 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
                 load_demo_xml(cr, m, idref, mode)
                 load_demo(cr, m, idref, mode)
                 cr.execute('update ir_module_module set demo=%s where id=%s', (True, mid))
-
-            load_test(cr, m, idref, mode)
+                
+                # launch tests only in demo mode, as most tests will depend
+                # on demo data. Other tests can be added into the regular
+                # 'data' section, but should probably not alter the data, 
+                # as there is no rollback.
+                load_test(cr, m, idref, mode)
 
             package_todo.append(package.name)