diff --git a/tests/test_file.py b/tests/test_file.py
index 9072b2343055769c9ec9077d8b4a0787a00c1f4a..50107ce7d24f942c4c307cf576842da3b5aa4b80 100644
--- a/tests/test_file.py
+++ b/tests/test_file.py
@@ -103,6 +103,7 @@ def test_file_with_space():
     qfile.download("test2.dat")
 
 
+# FIXME Can this test be removed? It seems to use the DropOffBox.
 @mark.local_server
 def test_pickup_file():
     d = models.DropOffBox()
@@ -123,6 +124,7 @@ def test_pickup_file():
         assert_is_not_none(file_.id)
 
 
+# FIXME Can this test be removed? It seems to use the DropOffBox.
 @mark.local_server
 def test_pickup_folder():
     # pickup_folder
@@ -150,6 +152,7 @@ def test_pickup_folder():
         file_.insert()
 
 
+# FIXME Can this test be removed? It seems to use the DropOffBox.
 @mark.local_server
 def test_file4():
     try:
@@ -215,6 +218,7 @@ def test_upload_complete_folder():
     c.delete()
 
 
+# FIXME Can this test be removed? It seems to use the DropOffBox.
 def test_file6():
     try:
         # upload file to testfiles2/testfile...
@@ -275,6 +279,7 @@ def test_file6():
             pass
 
 
+# FIXME Can this test be removed? It seems to use the DropOffBox.
 def test_file7():
     try:
         # upload file to testfiles2/testsub/testfile...
diff --git a/tests/test_tenpoints.py b/tests/test_tenpoints.py
index e23aabed074c407ece6bfa34d9b74186f8aedf15..8aa187bef64b46770671ff1deb528191f8640654 100644
--- a/tests/test_tenpoints.py
+++ b/tests/test_tenpoints.py
@@ -3,8 +3,10 @@
 # ** header v3.0
 # This file is a part of the CaosDB Project.
 #
+# Copyright (C) 2024 Daniel Hornung
 # Copyright (C) 2018 Research Group Biomedical Physics,
 # Max-Planck-Institute for Dynamics and Self-Organization Göttingen
+# Copyright (C) 2024 IndiScale GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -44,7 +46,7 @@ RecordTypes / Properties
 
 2) Daten:
 2.1 Einfügen von Datensätzen unter Benutzung der oben angelegten RecordTypes
-2.2 Hochladen von Dateien über HTTP und DropOffBox und Verknüpfung mit den
+2.2 Hochladen von Dateien über HTTP und Verknüpfung mit den
 Datensätzen
 2.3 Verwendung von Einheiten
 2.4 Nachtägliches Annotieren von Datensätzen, z.B. hinzufügen einer
@@ -292,7 +294,7 @@ def test_tenpoints1_5():
 def test_tenpoints2_1AND2_2():
     '''
     2.1 Einfügen von Datensätzen unter Benutzung der oben angelegten RecordTypes
-    & 2.2 Hochladen von Dateien über HTTP und DropOffBox und Verknüpfung mit den
+    & 2.2 Hochladen von Dateien über HTTP und Verknüpfung mit den
       Datensätzen
     '''
 
@@ -409,16 +411,6 @@ def test_tenpoints2_1AND2_2():
     assert int(fp.value) == fr.id
     print(d)
 
-    """insert file via dropOffBox."""
-    dob = h.DropOffBox().sync()
-    if os.path.isdir(dob.path):
-        f = open("test.dat", "w")
-        f.write("hello world\n")
-        f.close()
-        import shutil
-        shutil.move("test.dat", dob.path)
-        fo = h.File(path='testfiles/testfile2', pickup="test.dat").insert()
-
 
 def test_tenpoints2_3():
     '''2.3 Verwendung von Einheiten'''
diff --git a/tests/test_tickets.py b/tests/test_tickets.py
index 106d2f63aeb3c93840a67b86ebd6e51672c3b137..fa3c6a86319ee4b2c785a96c4eabe2de344a6458 100644
--- a/tests/test_tickets.py
+++ b/tests/test_tickets.py
@@ -466,6 +466,7 @@ def test_ticket_137():
         rt1.insert()
 
 
+# FIXME Can this test be removed? It seems to use the DropOffBox.
 @pytest.mark.skip
 def test_ticket_39():
     import os
diff --git a/tests/test_tickets_200.py b/tests/test_tickets_200.py
index b6af11aef5d37903fb53de2a96c48a3e44ac98df..3dfcef0488b240372b8218e8ae653ad135228302 100644
--- a/tests/test_tickets_200.py
+++ b/tests/test_tickets_200.py
@@ -174,6 +174,7 @@ def test_ticket_221():
     assert repr(RT2) == '<RecordType name="TestRT2">\n  <Property name="test_property_with_RT1" datatype="TestRT1" importance="RECOMMENDED" flag="inheritance:FIX"/>\n</RecordType>\n'
 
 
+# FIXME Can this test be removed? It seems to use the DropOffBox. Otherwise replace 'pickup'.
 def test_ticket_237():
 
     f1 = h.File(