diff --git a/tests/yanglint/interactive/add.test b/tests/yanglint/interactive/add.test
index d1cacc1052..0c4ff3520e 100644
--- a/tests/yanglint/interactive/add.test
+++ b/tests/yanglint/interactive/add.test
@@ -8,13 +8,6 @@ test add_basic {} {
     ly_cmd "list" "I modleafref\r.*I modleaf"
 }}
 
-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"
diff --git a/tests/yanglint/interactive/list.test b/tests/yanglint/interactive/list.test
index ab59a32d86..b1cf06a5bb 100644
--- a/tests/yanglint/interactive/list.test
+++ b/tests/yanglint/interactive/list.test
@@ -1,7 +1,7 @@
 source [expr {[info exists ::env(TESTS_DIR)] ? "$env(TESTS_DIR)/interactive/ly.tcl" : "ly.tcl"}]
 namespace import uti::regex_xml_elements uti::regex_json_pairs
 
-set modules {ietf-yang-library ietf-inet-types}
+set modules {ietf-inet-types ietf-yang-library}
 
 test list_basic {basic test} {
 -setup $ly_setup -cleanup $ly_cleanup -body {
diff --git a/tests/yanglint/modules/modimp-cwd.yang b/tests/yanglint/modules/modimp-cwd.yang
deleted file mode 100644
index 324946233f..0000000000
--- a/tests/yanglint/modules/modimp-cwd.yang
+++ /dev/null
@@ -1,8 +0,0 @@
-module modimp-cwd {
-  namespace "urn:yanglint:modimp-cwd";
-  prefix ic;
-
-  import modcwd {
-    prefix mc;
-  }
-}
diff --git a/tests/yanglint/non-interactive/disabled_searchdir.test b/tests/yanglint/non-interactive/disabled_searchdir.test
index 49fe13ee69..4143e03a8e 100644
--- a/tests/yanglint/non-interactive/disabled_searchdir.test
+++ b/tests/yanglint/non-interactive/disabled_searchdir.test
@@ -2,13 +2,6 @@ source [expr {[info exists ::env(TESTS_DIR)] ? "$env(TESTS_DIR)/non-interactive/
 
 set mdir $env(YANG_MODULES_DIR)
 
-# Test should be skipped if called by ctest.
-test disable_searchdir_once {Unsuccessfully imports module due to disabled cwd searching} {
--constraints {!ctest} -body {
-    ly_cmd "$mdir/modimp-cwd.yang"
-    ly_cmd_err "-D $mdir/modimp-cwd.yang" "not found in local searchdirs"
-}}
-
 test disable_searchdir_twice {Unsuccessfully imports module due to -D -D} {
     ly_cmd "$mdir/ietf-ip.yang"
     ly_cmd_err "-D -D $mdir/ietf-ip.yang" "Loading \"ietf-interfaces\" module failed."
diff --git a/tests/yanglint/non-interactive/list.test b/tests/yanglint/non-interactive/list.test
index 626d9a18b3..cf04e21aba 100644
--- a/tests/yanglint/non-interactive/list.test
+++ b/tests/yanglint/non-interactive/list.test
@@ -1,7 +1,7 @@
 source [expr {[info exists ::env(TESTS_DIR)] ? "$env(TESTS_DIR)/non-interactive/ly.tcl" : "ly.tcl"}]
 namespace import uti::regex_xml_elements uti::regex_json_pairs
 
-set modules {ietf-yang-library ietf-inet-types}
+set modules {ietf-inet-types ietf-yang-library}
 
 test list_basic {} {
     ly_cmd "-l" "ietf-yang-types"