diff --git a/tests/test_empty_text_value.py b/tests/test_empty_text_value.py
index b5d6165b6ffe359e9f7394f342488f24917890d9..b197b7299f752cc8121d0aa3bb099140071cf99f 100644
--- a/tests/test_empty_text_value.py
+++ b/tests/test_empty_text_value.py
@@ -39,6 +39,7 @@ def teardown():
         print(e)
 
 
+@pytest.mark.xfail(reason="""wait for f-empty-and-null-values branch of pylib""")
 def test_empty_string():
     r1 = db.Record()
     r1.add_parent("TestRT")
@@ -94,6 +95,7 @@ def test_null_value():
     assert len(db.execute_query("FIND Record TestRT")) == 2
 
 
+@pytest.mark.xfail(reason="""wait for f-empty-and-null-values branch of pylib""")
 def test_list_with_empty_string():
     r1 = db.Record()
     r1.add_parent("TestRT")
diff --git a/tests/test_issues_server.py b/tests/test_issues_server.py
index 9b866dd03f93606224daa317f697a4bbea00ac7c..3b24e1fcfc553617f2cd178970eefab8da507c41 100644
--- a/tests/test_issues_server.py
+++ b/tests/test_issues_server.py
@@ -24,7 +24,6 @@
 """Tests for issues on gitlab.com, project caosdb-mysqlbackend."""
 
 import caosdb as db
-from nose import with_setup
 
 
 def setup_module():
@@ -46,7 +45,6 @@ def teardown():
 
 # ########################### Issue tests start here ###########################
 
-@with_setup(setup, teardown)
 def test_issue_85_a():
     """SQLIntegrityConstraintViolationException for special inheritance patterns.
 
@@ -71,7 +69,6 @@ def test_issue_85_a():
     #           # Duplicate entry '12345-12346-12345' for key 'PRIMARY'
 
 
-@with_setup(setup, teardown)
 def test_issue_85_b():
     """SQLIntegrityConstraintViolationException for special inheritance patterns.