diff --git a/tools/lint/cmd_add.c b/tools/lint/cmd_add.c
index bbfdfd6..eb58745 100644
--- a/tools/lint/cmd_add.c
+++ b/tools/lint/cmd_add.c
@@ -68,7 +68,7 @@
         goto cleanup;
     }
 
-    while ((opt = getopt_long(argc, argv, "D:F:hi", options, &opt_index)) != -1) {
+    while ((opt = getopt_long(argc, argv, "DF:hi", options, &opt_index)) != -1) {
         switch (opt) {
         case 'D': /* --disable--search */
             if (options_ctx & LY_CTX_DISABLE_SEARCHDIRS) {
diff --git a/tools/lint/tests/interactive/add.test b/tools/lint/tests/interactive/add.test
new file mode 100644
index 0000000..59abe87
--- /dev/null
+++ b/tools/lint/tests/interactive/add.test
@@ -0,0 +1,19 @@
+source [expr {[info exists ::env(TESTS_DIR)] ? "$env(TESTS_DIR)/interactive/ly.tcl" : "ly.tcl"}]
+
+set mdir $::env(YANG_MODULES_DIR)
+
+test add_disable_searchdir_once {add --disable-searchdir} {
+-setup $ly_setup -cleanup $ly_cleanup -constraints {!ctest} -body {
+    ly_cmd "add $mdir/modimp-cwd.yang"
+    ly_cmd "clear"
+    ly_cmd_err "add -D $mdir/modimp-cwd.yang" "not found in local searchdirs"
+}}
+
+test add_disable_searchdir_twice {add -D -D} {
+-setup $ly_setup -cleanup $ly_cleanup -constraints {!ctest} -body {
+    ly_cmd "add $mdir/ietf-ip.yang"
+    ly_cmd "clear"
+    ly_cmd_err "add -D -D $mdir/ietf-ip.yang" "Loading \"ietf-interfaces\" module failed."
+}}
+
+cleanupTests
diff --git a/tools/lint/tests/interactive/modcwd.yang b/tools/lint/tests/interactive/modcwd.yang
new file mode 100644
index 0000000..db33e73
--- /dev/null
+++ b/tools/lint/tests/interactive/modcwd.yang
@@ -0,0 +1,4 @@
+module modcwd {
+  namespace "urn:yanglint:modcwd";
+  prefix mc;
+}