diff --git a/tests/test_boolean.py b/tests/test_boolean.py
index 296dfab0be6524461861f58d4e5eb26087463b8f..eb9b359a9d2a62dc4ce761b6461415f30774af85 100644
--- a/tests/test_boolean.py
+++ b/tests/test_boolean.py
@@ -135,7 +135,7 @@ def test_record():
             rec3.get_property(
                 "SimpleBooleanProperty").get_errors()[0].description,
             "Cannot parse value to boolean (either 'true' or 'false', "
-            "ignoring case).")
+            "case insensitive).")
 
     finally:
         try:
diff --git a/tests/test_issues_server.py b/tests/test_issues_server.py
index 37f6728f5b76dde48bcfe1f9fcaec97edfaeb666..a05a1ca465d6515552213c963d6d3e1211695eb2 100644
--- a/tests/test_issues_server.py
+++ b/tests/test_issues_server.py
@@ -221,20 +221,20 @@ def test_issue_120():
         username="NON_EXISTING_USER",
         permission="USE:AS_REFERENCE")
     entity.update(flags={"ACL": None})
-    assert entity.messages["Warning", 1104][0] == "User Role does not exist."
+    assert entity.messages["Warning", 1104][0] == "User role does not exist."
 
     entity.deny(
         realm="NON_EXISTING_REALM",
         username="NON_EXISTING_USER",
         permission="USE:AS_REFERENCE")
     entity.update(flags={"ACL": None})
-    assert entity.messages["Warning", 1104][0] == "User Role does not exist."
+    assert entity.messages["Warning", 1104][0] == "User role does not exist."
 
     entity.deny(
         role="ALSO_NON_EXISTING_ROLE",
         permission="USE:AS_REFERENCE")
     entity.update(flags={"ACL": None})
-    assert entity.messages["Warning", 1104][0] == "User Role does not exist."
+    assert entity.messages["Warning", 1104][0] == "User role does not exist."
 
 
 def test_issue_134():
diff --git a/tests/test_misc.py b/tests/test_misc.py
index 559bd9971f9976011db37587db501ee4db0e2210..177843a765a83ceb9b4de3f43b1b2caa2e31658d 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -138,7 +138,8 @@ def test_parent_duplicate_1():
     assert len(rt2.get_parents()) == 1
     assert len(rt2.get_warnings()) == 1
     assert rt2.get_warnings()[
-        0].description == "This entity had parent duplicates. That is meaningless and only one parent had been inserted."
+        0].description == ("This entity had parent duplicates. That is meaningless and only one "
+                           "parent has been inserted.")
 
 
 def test_parent_duplicate_2():
diff --git a/tests/test_permissions.py b/tests/test_permissions.py
index a77b77434373f4b0527489a3764669778cb1907e..3fb41c6d2731607ed3ad02e1305e2f2f2b9dab67 100644
--- a/tests/test_permissions.py
+++ b/tests/test_permissions.py
@@ -1167,13 +1167,13 @@ def test_check_entity_acl_roles():
         grant_permission(p, "USE:AS_PARENT", username="asdf-non-existing",
                          switch=False)
     errors = cm.value.entities[0].get_errors()
-    assert errors[0].description == "User Role does not exist."
+    assert errors[0].description == "User role does not exist."
     db.administration.set_server_property(
         "CHECK_ENTITY_ACL_ROLES_MODE", "SHOULD")
 
     # test success with warning
     ret = grant_permission(p, "USE:AS_PROPERTY",
                            username="asdf-non-existing", switch=False)
-    assert ret.get_warnings()[0].description == "User Role does not exist."
+    assert ret.get_warnings()[0].description == "User role does not exist."
 
     db.administration.set_server_property("CHECK_ENTITY_ACL_ROLES_MODE", reset)
diff --git a/tests/test_query_template.py b/tests/test_query_template.py
index c5fc3c7858e9b87eff6aca6e6d04a8d3d055b8b3..e4c662d6d166e0b64bab6e16733b455ff3de1254 100644
--- a/tests/test_query_template.py
+++ b/tests/test_query_template.py
@@ -105,8 +105,8 @@ def test_insertion_failure_syntax():
     with raises(db.TransactionError) as cm:
         q.insert()
     print(cm.value)
-    assert (cm.value.errors[0].msg ==
-            "An error occured during the parsing of this query. Maybe you use a wrong syntax?")
+    assert (cm.value.errors[0].msg == "An error occured during the parsing of this query. "
+            "Maybe you were using a wrong syntax?")
 
 
 def test_insertion_failure_count_query_not_allowed():
@@ -117,7 +117,7 @@ def test_insertion_failure_count_query_not_allowed():
     with raises(db.TransactionError) as cm:
         q.insert()
     assert (cm.value.errors[0].msg ==
-            "QueryTemplates may not be defined by 'COUNT...' queries for consistency reasons.")
+            "QueryTemplates may not be defined by 'COUNT' queries for consistency reasons.")
 
 
 def test_insertion_failure_select_query_not_allowed():
@@ -129,7 +129,7 @@ def test_insertion_failure_select_query_not_allowed():
     with raises(db.TransactionError) as cm:
         q.insert()
     assert (cm.value.errors[0].msg ==
-            "QueryTemplates may not be defined by 'SELECT... FROM...' queries for consistency reasons.")
+            "QueryTemplates may not be defined by 'SELECT ... FROM ...' queries for consistency reasons.")
 
 
 def test_deletion_success():
@@ -171,8 +171,8 @@ def test_update_failure_syntax():
     q.query = "ashdjfkasjdf"
     with raises(db.TransactionError) as cm:
         q.update()
-    assert(cm.value.errors[0].msg ==
-           "An error occured during the parsing of this query. Maybe you use a wrong syntax?")
+    assert(cm.value.errors[0].msg == "An error occured during the parsing of this query. Maybe you "
+           "were using a wrong syntax?")
 
 
 def test_update_failure_count_query_not_allowed():
@@ -181,7 +181,7 @@ def test_update_failure_count_query_not_allowed():
     with raises(db.TransactionError) as cm:
         q.update()
     assert (cm.value.errors[0].msg ==
-            "QueryTemplates may not be defined by 'COUNT...' queries for consistency reasons.")
+            "QueryTemplates may not be defined by 'COUNT' queries for consistency reasons.")
 
 
 def test_update_failure_select_query_not_allowed():
@@ -189,8 +189,8 @@ def test_update_failure_select_query_not_allowed():
     q.query = "SELECT TestAnimal FROM TestExperiment WHICH HAS A TestAnimal = Pig"
     with raises(db.TransactionError) as cm:
         q.update()
-    assert (cm.value.errors[0].msg ==
-            "QueryTemplates may not be defined by 'SELECT... FROM...' queries for consistency reasons.")
+    assert (cm.value.errors[0].msg == "QueryTemplates may not be defined by 'SELECT ... FROM ...' "
+            "queries for consistency reasons.")
 
 
 def test_update_failure_non_existing():