diff --git a/tests/test_affiliation.py b/tests/test_affiliation.py
index 153e9db31f6ee74da4bb7fd3527638334404957b..2b72cca4a0bb4a67b5a8f9490947015cf2d6a370 100644
--- a/tests/test_affiliation.py
+++ b/tests/test_affiliation.py
@@ -26,11 +26,18 @@
 @author: tf
 """
 import os
-import caosdb as db
-from nose.tools import nottest, assert_equal, assert_is_not_none
+import linkahead as db
+import pytest
 from pytest import raises
 
 
+
+def assert_equal(a, b):
+    assert a == b
+
+def assert_is_not_none(a):
+    assert a is not None
+
 def setup_module():
     f = open(file_path, "w")
     f.write("hello, world!")
@@ -218,7 +225,7 @@ def test_file_file_is_invalid():
     assert ee.msg == "Affiliation is not defined for this child-parent constellation."
 
 
-@nottest
+@pytest.mark.skip()
 def test_query_party_example():
     try:
         organisation = db.RecordType(name="Organisation").insert()
diff --git a/tests/test_data_model_leap.py b/tests/test_data_model_leap.py
index f8489c8b0bb4994517c4ba45874858fbb874874e..6db2f65ed9afd4a111c3aa771c092e37679b9638 100644
--- a/tests/test_data_model_leap.py
+++ b/tests/test_data_model_leap.py
@@ -25,11 +25,21 @@
 
 @author: fitschen
 """
-from nose.tools import assert_true, assert_equal, assert_is_not_none  # @UnresolvedImport
+def assert_equal(a, b):
+    assert a == b
+
+
+def assert_true(a):
+    assert a
+
+
+def assert_is_not_none(a):
+    assert a is not None
 
 
 def test_leap_datamodel():
-    import caosdb as h
+    import linkahead as h
+
     try:
         h.execute_query("FIND ENTITY WITH ID>100").delete()
     except BaseException:
diff --git a/tests/test_deletion.py b/tests/test_deletion.py
index bf449218765e49f994c69eaebff60c6673c0f867..d73659b52c31738e4cf72be14e6c16c26e0e8e09 100755
--- a/tests/test_deletion.py
+++ b/tests/test_deletion.py
@@ -26,9 +26,19 @@
 # Testcase fuer deletion
 # A. Schlemmer, 08/2014
 
-from nose.tools import with_setup, assert_false, assert_true, assert_raises, assert_equal
 
-import caosdb as h
+import pytest
+
+def assert_false(a):
+    assert not a
+
+def assert_true(a):
+    assert a
+
+def assert_equal(a, b):
+    assert a == b
+
+import linkahead as h
 
 
 def setup_module():
@@ -143,7 +153,9 @@ def test_deletion():
     assert cr2.id is not None
 
     c.extend([cr1, sr, d])
-    assert_raises(h.TransactionError, c.delete)
+    with pytest.raises(h.TransactionError):
+        c.delete()
+
     assert_true(c.has_errors())
     assert_equal(int(c.get_errors()[0].code), 12)
 
diff --git a/tests/test_file.py b/tests/test_file.py
index e8ff621e441411508452fa3bb23c3da48b0a2599..9072b2343055769c9ec9077d8b4a0787a00c1f4a 100644
--- a/tests/test_file.py
+++ b/tests/test_file.py
@@ -34,12 +34,27 @@ from sys import maxsize as maxint
 
 from lxml import etree
 from pytest import raises, mark
-from nose.tools import (assert_equal, assert_false, assert_is_not_none,
-                        assert_true)
-from caosdb import execute_query, get_config, get_connection
-from caosdb.common import models
-from caosdb.exceptions import EntityError, TransactionError
-from caosdb.utils.checkFileSystemConsistency import runCheck
+
+from linkahead import execute_query, get_config, get_connection
+from linkahead.common import models
+from linkahead.exceptions import EntityError, TransactionError
+from linkahead.utils.checkFileSystemConsistency import runCheck
+
+
+def assert_equal(a, b):
+    assert a == b
+
+
+def assert_false(a):
+    assert not a
+
+
+def assert_is_not_none(a):
+    assert a is not None
+
+
+def assert_true(a):
+    assert a
 
 
 def setup_module():
diff --git a/tests/test_list.py b/tests/test_list.py
index b2c246e092d9998e37b2c4fd12f2f18f26c4ae35..f204124a5fb16c0a4565db80901af76679688ff9 100644
--- a/tests/test_list.py
+++ b/tests/test_list.py
@@ -26,13 +26,20 @@
 @author: tf
 """
 import os
-import caosdb as db
-from caosdb.exceptions import (TransactionError,
+import linkahead as db
+from linkahead.exceptions import (TransactionError,
                                UnqualifiedPropertiesError)
-from nose.tools import assert_true, assert_equal
 from pytest import raises
 
 
+def assert_equal(a, b):
+    assert a == b
+
+
+def assert_true(a):
+    assert a
+
+
 def setup_function(function):
     d = db.execute_query("FIND ENTITY WITH ID > 99")
     if len(d) > 0:
diff --git a/tests/test_manual.py b/tests/test_manual.py
index 1ba0b50dfb8d68c6c32ae82a4fe94b5e79f2d32a..c9a18e18a6b723213dc0d4c72d4667e523021773 100644
--- a/tests/test_manual.py
+++ b/tests/test_manual.py
@@ -21,11 +21,23 @@
 #
 # ** end header
 #
-from caosdb import Record, RecordType, Property, Container, File, execute_query
+from linkahead import Record, RecordType, Property, Container, File, execute_query
 
-# @UnresolvedImport
-from nose.tools import assert_not_equal, assert_true, assert_is_not_none, assert_equal
-from nose.tools.nontrivial import nottest
+
+def assert_not_equal(a, b):
+    assert a != b
+
+def assert_true(a):
+    assert a
+
+def assert_is_not_none(a):
+    assert a is not None
+
+def assert_equal(a, b):
+    assert a == b
+
+
+import pytest
 
 
 def test_retrieve_shortcuts():
@@ -103,9 +115,9 @@ def test_references():
             pass
 
 
-@nottest
+@pytest.mark.skip()
 def test_name_overriding():
-    from caosdb import execute_query
+    from linkahead import execute_query
 
     try:
         # RecordType "Person"
diff --git a/tests/test_name_properties.py b/tests/test_name_properties.py
index ad53e2050d9d7e514b72ad3f3df5be27603028cf..3128c9d1fd47405969f20598d60629e32f890f88 100644
--- a/tests/test_name_properties.py
+++ b/tests/test_name_properties.py
@@ -26,10 +26,14 @@
 @author: tf
 """
 
-import caosdb as db
+import linkahead as db
 from pytest import raises, mark
-from nose.tools import assert_true, assert_equal
 
+def assert_true(a):
+    assert a
+
+def assert_equal(a, b):
+    assert a == b
 
 def setup_module():
     pass
diff --git a/tests/test_query_template.py b/tests/test_query_template.py
index b2bcab4c4d9001b02c3e426081deec99c9fc65a4..528db96a6aee7763a777665322bff83cf92cd860 100644
--- a/tests/test_query_template.py
+++ b/tests/test_query_template.py
@@ -25,11 +25,22 @@
 
 @author: tf
 """
-import caosdb as db
-from nose.tools import assert_true, assert_equal, assert_is_not_none
+import linkahead as db
 from pytest import raises
 
 
+def assert_true(a):
+    assert a
+
+
+def assert_equal(a, b):
+    assert a == b
+
+
+def assert_is_not_none(a):
+    assert a is not None
+
+
 def setup_module():
     db.configure_connection()
     try:
diff --git a/tests/test_records.py b/tests/test_records.py
index 182375ba2495539025b47cb604f1acaed07adade..82cae22480c94e0f5c7fc451c68e15479bf8081f 100644
--- a/tests/test_records.py
+++ b/tests/test_records.py
@@ -23,12 +23,23 @@
 #
 from random import randint
 from sys import maxsize as maxint
-from nose.tools import nottest, assert_is_not_none, assert_equal, assert_true, assert_false
+import pytest
 from pytest import raises
-from caosdb import Record
-from caosdb.exceptions import CaosDBException
-import caosdb
+from linkahead import Record
+from linkahead.exceptions import CaosDBException
+import linkahead as caosdb
 
+def assert_is_not_none(a):
+    assert a is not None
+
+def assert_equal(a, b):
+    assert a == b
+
+def assert_true(a):
+    assert a
+
+def assert_false(a):
+    assert not a
 
 def teardown_function(function):
     try:
@@ -477,7 +488,7 @@ def test_property_doublette4():
             pass
 
 
-@nottest
+@pytest.mark.skip()
 def test_non_existent():
     rec = Record(id=466142163).retrieve(raise_exception_on_error=False)