diff --git a/test/Makefile b/test/Makefile
index deb200d0..6585edd6 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -20,7 +20,7 @@ TEST_DEPS := client data_sink naughty_child
 # Tests: need to be compiled and run by test-% target
 TESTS ?= env empty hello_world malloc mmap file fs_perms getpid spawn sched pipe time timerfd \
 	truncate readdir mkdir open stat link symlink chmod chown tls pthread system_info rlimit \
-	server server_epoll unix_socket cout hostfs cpuid rdtsc device sleep exit_group flock \
+	server server_epoll unix_socket cout hostfs cpuid rdtsc device sleep exit_group posix_flock \
 	ioctl fcntl eventfd emulate_syscall access signal sysinfo prctl rename procfs wait \
 	spawn_attribute exec statfs random umask pgrp vfork mount
 # Benchmarks: need to be compiled and run by bench-% target
diff --git a/test/flock/Makefile b/test/posix_flock/Makefile
similarity index 100%
rename from test/flock/Makefile
rename to test/posix_flock/Makefile
diff --git a/test/flock/main.c b/test/posix_flock/main.c
similarity index 97%
rename from test/flock/main.c
rename to test/posix_flock/main.c
index b74cd89c..b0365c16 100644
--- a/test/flock/main.c
+++ b/test/posix_flock/main.c
@@ -14,14 +14,14 @@
 
 const char **g_argv;
 int g_argc;
-const char *g_file_path = "/root/test_flock_file.txt";
+const char *g_file_path = "/root/test_posix_flock_file.txt";
 int g_fd;
 off_t g_file_len = 128;
 
 // Expected child arguments
 const int child_argc = 2;
 const char *child_argv[3] = {
-    "flock",
+    "posix_flock",
     "child",
     NULL
 };
@@ -86,7 +86,7 @@ static int test_setlk() {
 static int test_spawn_child_and_unlock() {
     int status, child_pid;
     int ret = posix_spawn(&child_pid,
-                          "/bin/flock", NULL, NULL,
+                          "/bin/posix_flock", NULL, NULL,
                           (char *const *)child_argv,
                           NULL);
     if (ret < 0) {