diff --git a/src/pool/test/pool.cc b/src/pool/test/pool.cc
index 5b2580ae8b..2889ee29f0 100644
--- a/src/pool/test/pool.cc
+++ b/src/pool/test/pool.cc
@@ -66,7 +66,7 @@ public:
 
     void setUp()
     {
-        string db_name = "testdb";
+        string db_name = "ONE_test_database";
 
         if (mysql)
         {
diff --git a/src/template/test/template.cc b/src/template/test/template.cc
index dfdd060a18..163310fa70 100644
--- a/src/template/test/template.cc
+++ b/src/template/test/template.cc
@@ -64,13 +64,13 @@ public:
             "</REQUIREMENTS></TEMPLATE>";
 
         test_ok_str=
-            "\n\tCPU=4"
-            "\n\tDISK=EXTRA=disk attribute ,FILE=path1"
-            "\n\tDISK=EXTRA=str,FILE=path2,TYPE=disk"
-            "\n\tEMPTY_VAR="
-            "\n\tGRAPHICS=PORT=12,VNC=127.0.0.1"
-            "\n\tMEMORY=345"
-            "\n\tREQUIREMENTS=HOSTNAME = \"host*.com\"";
+            "CPU=4\n"
+            "DISK=EXTRA=disk attribute ,FILE=path1\n"
+            "DISK=EXTRA=str,FILE=path2,TYPE=disk\n"
+            "EMPTY_VAR=\n"
+            "GRAPHICS=PORT=12,VNC=127.0.0.1\n"
+            "MEMORY=345\n"
+            "REQUIREMENTS=HOSTNAME = \"host*.com\"\n";
     }
 
     ~TemplateTest(){};