diff --git a/app/template_folder/rest.py b/app/template_folder/rest.py
index eabf1512c..5097fd429 100644
--- a/app/template_folder/rest.py
+++ b/app/template_folder/rest.py
@@ -111,7 +111,7 @@ def move_to_template_folder(service_id, target_template_folder_id=None):
         try:
             template_folder = dao_get_template_folder_by_id_and_service_id(template_folder_id, service_id)
         except NoResultFound:
-            msg = 'Could not move to folder: No folder found with id {} for service {}'.format(
+            msg = 'No folder found with id {} for service {}'.format(
                 template_folder_id,
                 service_id
             )
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
index d5480a3bd..2e3e25013 100755
--- a/scripts/run_tests.sh
+++ b/scripts/run_tests.sh
@@ -31,5 +31,5 @@ flake8 .
 display_result $? 1 "Code style check"
 
 # run with four concurrent threads
-py.test --cov=app --cov-report=term-missing tests/ --junitxml=test_results.xml -n4 -v --maxfail=10
+py.test --disable-pytest-warnings --cov=app --cov-report=term-missing tests/ --junitxml=test_results.xml -n4 -v --maxfail=10
 display_result $? 2 "Unit tests"