diff --git a/catalogue/CatalogueTest.cpp b/catalogue/CatalogueTest.cpp
index a19739edc498ef499046d46c2b232d1557a3c336..db33ed0383e9ef745ccab1d5db20899125684f55 100644
--- a/catalogue/CatalogueTest.cpp
+++ b/catalogue/CatalogueTest.cpp
@@ -3061,6 +3061,8 @@ TEST_P(cta_catalogue_CatalogueTest, getTapesForWriting) {
   m_catalogue->createTapePool(m_cliSI, tapePoolName, 2, true, "Create tape pool");
   m_catalogue->createTape(m_cliSI, vid, logicalLibraryName, tapePoolName, encryptionKey, capacityInBytes, disabledValue,
    fullValue, comment);
+  m_catalogue->modifyTapeLabelLog(vid, "tape_drive");
+  m_catalogue->setTapeLbp(vid, true);
 
   const std::list<catalogue::TapeForWriting> tapes = m_catalogue->getTapesForWriting(logicalLibraryName);
 
diff --git a/scheduler/SchedulerTest.cpp b/scheduler/SchedulerTest.cpp
index fbb9f56e747cbd185bf3c56d49739b2199041248..469d161de549633e832798aa0a0773a30dad08c8 100644
--- a/scheduler/SchedulerTest.cpp
+++ b/scheduler/SchedulerTest.cpp
@@ -394,6 +394,9 @@ TEST_P(SchedulerTest, archive_and_retrieve_new_file) {
   catalogue.createTape(s_adminOnAdminHost, s_vid, s_libraryName, s_tapePoolName, nullopt, capacityInBytes,
     notDisabled, notFull, tapeComment);
 
+  catalogue.modifyTapeLabelLog(s_vid, "tape_drive");
+  catalogue.setTapeLbp(s_vid, true);
+
   {
     // Emulate a tape server by asking for a mount and then a file (and succeed
     // the transfer)
@@ -530,7 +533,10 @@ TEST_P(SchedulerTest, retry_archive_until_max_reached) {
   bool notFull = false;
   catalogue.createTape(s_adminOnAdminHost, s_vid, s_libraryName, s_tapePoolName, nullopt, capacityInBytes, notDisabled,
     notFull, tapeComment);
-  
+
+  catalogue.modifyTapeLabelLog(s_vid, "tape_drive");
+  catalogue.setTapeLbp(s_vid, true);
+
   {
     // Emulate a tape server by asking for a mount and then a file
     std::unique_ptr<cta::TapeMount> mount;