diff --git a/src/fpm.f90 b/src/fpm.f90
index 7e9d125fa6..932eae2fc7 100644
--- a/src/fpm.f90
+++ b/src/fpm.f90
@@ -1,5 +1,6 @@
 module fpm
-use fpm_strings, only: string_t, operator(.in.), glob, join, string_cat, fnv_1a, lower
+use fpm_strings, only: string_t, operator(.in.), glob, join, string_cat, fnv_1a, &
+                      lower, str_ends_with
 use fpm_backend, only: build_package
 use fpm_command_line, only: fpm_build_settings, fpm_new_settings, &
                       fpm_run_settings, fpm_install_settings, fpm_test_settings, &
diff --git a/test/fpm_test/test_filesystem.f90 b/test/fpm_test/test_filesystem.f90
index 1ce1b6e4c4..b6b7681706 100644
--- a/test/fpm_test/test_filesystem.f90
+++ b/test/fpm_test/test_filesystem.f90
@@ -1,6 +1,7 @@
 module test_filesystem
     use testsuite, only : new_unittest, unittest_t, error_t, test_failed
-    use fpm_filesystem, only: canon_path, is_dir, mkdir, os_delete_dir
+    use fpm_filesystem, only: canon_path, is_dir, mkdir, os_delete_dir, &
+                              join_path
     use fpm_environment, only: OS_WINDOWS, get_os_type, os_is_unix
     implicit none
     private
@@ -110,17 +111,9 @@ subroutine test_mkdir_rmdir(error)
         !> Error handling
         type(error_t), allocatable, intent(out) :: error
 
-
         call check_mkdir(error, join_path("tmpdir","subdir"))
         if (allocated(error)) return
 
-        if (is_win) then
-            call check_rmdir(error, "tmpdir\subdir")
-          else
-            call check_rmdir(error, "tmpdir/subdir")
-        end if
-        if (allocated(error)) return
-
         call check_rmdir(error, "tmpdir")
         if (allocated(error)) return