diff --git a/mongoose.h b/mongoose.h
index 14357da6..bf3eb537 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -778,6 +778,7 @@ typedef int socklen_t;
 #define realpath(a, b) _fullpath((b), (a), MG_PATH_MAX)
 #define sleep(x) Sleep((x) *1000)
 #define mkdir(a, b) _mkdir(a)
+#define rmdir(a) _rmdir(a)
 #define timegm(x) _mkgmtime(x)
 
 #ifndef S_ISDIR
diff --git a/src/arch_win32.h b/src/arch_win32.h
index 39923c17..613ff46a 100644
--- a/src/arch_win32.h
+++ b/src/arch_win32.h
@@ -159,6 +159,7 @@ typedef int socklen_t;
 #define realpath(a, b) _fullpath((b), (a), MG_PATH_MAX)
 #define sleep(x) Sleep((x) *1000)
 #define mkdir(a, b) _mkdir(a)
+#define rmdir(a) _rmdir(a)
 #define timegm(x) _mkgmtime(x)
 
 #ifndef S_ISDIR
diff --git a/test/unit_test.c b/test/unit_test.c
index 2243900c..d7c7a866 100644
--- a/test/unit_test.c
+++ b/test/unit_test.c
@@ -4422,9 +4422,9 @@ static bool set3_fn(enum mg_dash_op op, struct mg_dash_user *u) {
 static bool test_upload_dir(const struct mg_dash_user *u, char *buf, size_t len) {
   (void) u;
 #if MG_ARCH == MG_ARCH_UNIX || MG_ARCH == MG_ARCH_WIN32
-  mkdir("/tmp/mongoose_dash_test", 0755);
+  mkdir("mongoose_dash_test", 0755);
 #endif
-  mg_snprintf(buf, len, "%s", "/tmp/mongoose_dash_test");
+  mg_snprintf(buf, len, "%s", "mongoose_dash_test");
   return true;
 }
 
@@ -4588,7 +4588,7 @@ static void test_dash(void) {
 
   memset(&dash, 0, sizeof(dash));
   dash.session_auto_expiration_seconds = 1;
-  remove("/tmp/mongoose_dash_test/test.bin");
+  remove("mongoose_dash_test/test.bin");
 
   MG_DASH_ADD_FIELD_SET(&dash, &test_files_set);
   MG_DASH_ADD_FIELD_SET(&dash, &set1);
@@ -4917,6 +4917,9 @@ static void test_dash(void) {
     ASSERT(strstr(buf, test_bin_probe) != NULL);
     mg_mgr_free(&mgr3);
   }
+
+  remove("mongoose_dash_test/test.bin");
+  rmdir("mongoose_dash_test");
 }
 
 #define DASHBOARD(x) \