diff --git a/catalogue/ArchiveFileItor.cpp b/catalogue/ArchiveFileItor.cpp
index ebbf900dabff9c0877c0feb2da16af23d2b5723e..a46e21173efe9c086133d6296d626ef281734a0a 100644
--- a/catalogue/ArchiveFileItor.cpp
+++ b/catalogue/ArchiveFileItor.cpp
@@ -78,7 +78,7 @@ bool ArchiveFileItor::hasMore() const {
 //------------------------------------------------------------------------------
 // next
 //------------------------------------------------------------------------------
-common::dataStructures::ArchiveFile ArchiveFileItor::next() const {
+common::dataStructures::ArchiveFile ArchiveFileItor::next() {
   if(nullptr == m_impl) {
     throw exception::Exception(std::string(__FUNCTION__) + " failed: "
       "This iterator is invalid");
diff --git a/catalogue/ArchiveFileItor.hpp b/catalogue/ArchiveFileItor.hpp
index ca58f6191909c63bde4aed6a90436c373a09e2e8..74d19e65839d217e051365c26a3aa5cd85ca66ca 100644
--- a/catalogue/ArchiveFileItor.hpp
+++ b/catalogue/ArchiveFileItor.hpp
@@ -89,7 +89,7 @@ public:
   /**
    * Returns the next archive or throws an exception if there isn't one.
    */
-  common::dataStructures::ArchiveFile next() const;
+  common::dataStructures::ArchiveFile next();
 
 private:
 
diff --git a/catalogue/CatalogueTest.cpp b/catalogue/CatalogueTest.cpp
index a048fac06153af61783bb829c041c26338683151..052b08f32a1e99bdd52491c80bdd2cbc345737d7 100644
--- a/catalogue/CatalogueTest.cpp
+++ b/catalogue/CatalogueTest.cpp
@@ -194,7 +194,7 @@ std::map<std::string, cta::common::dataStructures::Tape> cta_catalogue_Catalogue
 // archiveFileItorToMap
 //------------------------------------------------------------------------------
 std::map<uint64_t, cta::common::dataStructures::ArchiveFile> cta_catalogue_CatalogueTest::archiveFileItorToMap(
-  const cta::catalogue::ArchiveFileItor &itor) {
+  cta::catalogue::ArchiveFileItor &itor) {
   using namespace cta;
 
   try {
@@ -7509,7 +7509,7 @@ TEST_P(cta_catalogue_CatalogueTest, filesWrittenToTape_many_archive_files) {
 
   {
     const uint64_t startFseq = 1;
-    const auto archiveFileItor = m_catalogue->getArchiveFilesForRepackItor(vid1, startFseq);
+    auto archiveFileItor = m_catalogue->getArchiveFilesForRepackItor(vid1, startFseq);
     const auto m = archiveFileItorToMap(archiveFileItor);
     ASSERT_EQ(nbArchiveFiles, m.size());
 
diff --git a/catalogue/CatalogueTest.hpp b/catalogue/CatalogueTest.hpp
index 6deed171a76c34b142c9c35e63285e035a32c8c6..20e3b3a5e565c2affb17e0e6910cf129089f753d 100644
--- a/catalogue/CatalogueTest.hpp
+++ b/catalogue/CatalogueTest.hpp
@@ -63,7 +63,7 @@ protected:
    * @return Map from archive file ID to archive file.
    */
   std::map<uint64_t, cta::common::dataStructures::ArchiveFile> archiveFileItorToMap(
-    const cta::catalogue::ArchiveFileItor &itor);
+    cta::catalogue::ArchiveFileItor &itor);
 
   /**
    * Creates a map from archive file ID to archive file from the specified