diff --git a/tests/test_issues_server.py b/tests/test_issues_server.py
index 0eb2129648e9f43901824bd3c3bf413df9f9375c..13e10ac6d7d4777f38bbde14b2ffe0a7ee5e483c 100644
--- a/tests/test_issues_server.py
+++ b/tests/test_issues_server.py
@@ -233,3 +233,27 @@ def test_issue_120():
         permission="USE:AS_REFERENCE")
     entity.update(flags={"ACL": None})
     assert entity.messages["Warning", 1104][0] == "User Role does not exist."
+
+
+def test_issue_134():
+    """multiple white space characters after `FROM`"""
+    db.execute_query("SELECT pname FROM  ename")
+
+
+def test_issue_131():
+    """white space befor unit with strange character"""
+    rt = db.RecordType(name="TestType").insert()
+    prop = db.Property(name="TestProp", datatype=db.INTEGER, unit="€").insert()
+    rec = db.Record(name="TestRecord").add_property(
+        name=prop.name, value=101, unit="€")
+    rec.add_parent(rt)
+    rec.insert()
+    result_ids = [ent.id for ent in db.execute_query(
+        "FIND Entity WITH {} > 100 €".format(prop.name))]
+
+    assert rec.id in result_ids
+
+    result_ids = [ent.id for ent in db.execute_query(
+        "FIND Entity WITH {} > 100.5 €".format(prop.name))]
+
+    assert rec.id in result_ids