diff --git a/unittests/test_tool.py b/unittests/test_tool.py
index 08b3a0e4f9623e996540746ac408801090b97aa3..a9b8a2ec723cf78b41b8f8f2675fe142cddec3ae 100755
--- a/unittests/test_tool.py
+++ b/unittests/test_tool.py
@@ -29,7 +29,8 @@ import logging
 
 from caoscrawler.stores import GeneralStore, RecordStore
 import os
-from caoscrawler.crawl import Crawler, SecurityMode, split_restricted_path
+from caoscrawler.crawl import (_treat_deprecated_prefix, Crawler, crawler_main,
+                               SecurityMode, split_restricted_path)
 from caoscrawler.identifiable import Identifiable
 from caoscrawler.structure_elements import File, DictTextElement, DictListElement, DictElement
 from caoscrawler.scanner import scan_directory
@@ -39,7 +40,6 @@ from simulated_server_data import full_data
 from functools import partial
 from copy import deepcopy
 from unittest.mock import patch
-from caoscrawler.crawl import crawler_main
 import caosdb.common.models as dbmodels
 from unittest.mock import MagicMock, Mock
 from os.path import join, dirname, basename
@@ -994,9 +994,13 @@ def test_deprecated_prefix_option():
     with pytest.deprecated_call():
         crawler_main("./", rfp("scifolder_cfood.yml"), prefix="to/be/removed")
 
+    # Check that crawler main terminates with an error
+    assert 1 = crawler_main("./", rfp("scifolder_cfood.yml"), prefix="to/be/removed",
+                            remove_prefix="to/be/removed")
+
     with raises(ValueError) as ve:
-        crawler_main("./", rfp("scifolder_cfood.yml"), prefix="to/be/removed",
-                     remove_prefix="to/be/removed")
+
+        _treat_deprecated_prefix(prefix="to/be/removed", remove_prefix="to/be/removed")
 
     assert "(deprecated) `prefix` and the `remove_prefix`" in str(ve.value)