diff --git a/kernel_module/Makefile b/kernel_module/Makefile
index 2eca9b8..87d35c0 100644
--- a/kernel_module/Makefile
+++ b/kernel_module/Makefile
@@ -1,13 +1,10 @@
 obj-m += $(addsuffix .o, $(notdir $(basename $(wildcard $(BR2_EXTERNAL_KERNEL_MODULE_PATH)/*.c))))
 ccflags-y := -Wno-declaration-after-statement -std=gnu99
 
-.PHONY: all clean test
+.PHONY: all clean
 
-all: test
+all:
 	$(MAKE) -C '$(LINUX_DIR)' M='$(PWD)' modules
 
 clean:
 	$(MAKE) -C '$(LINUX_DIR)' M='$(PWD)' clean
-
-test:
-	$(MAKE) -C '$(PWD)/test'
diff --git a/kernel_module/external.mk b/kernel_module/external.mk
index 476e933..1b8a500 100644
--- a/kernel_module/external.mk
+++ b/kernel_module/external.mk
@@ -10,11 +10,12 @@ KERNEL_MODULE_SITE_METHOD = local
 
 define KERNEL_MODULE_BUILD_CMDS
 	$(MAKE) -C '$(@D)' LINUX_DIR='$(LINUX_DIR)' PWD='$(@D)' CC='$(TARGET_CC)' LD='$(TARGET_LD)'
+	$(MAKE) -C '$(@D)/user' CC='$(TARGET_CC)' LD='$(TARGET_LD)'
 endef
 
 define KERNEL_MODULE_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0655 $(@D)/*.ko '$(TARGET_DIR)'
-	$(INSTALL) -D -m 0755 $(@D)/test/ins_rm_mod '$(TARGET_DIR)'
+	$(INSTALL) -D -m 0755 $(@D)/user/ins_rm_mod '$(TARGET_DIR)'
 endef
 
 $(eval $(kernel-module))
diff --git a/kernel_module/test/ins_rm_mod b/kernel_module/test/ins_rm_mod
deleted file mode 100755
index c4f7df7..0000000
Binary files a/kernel_module/test/ins_rm_mod and /dev/null differ
diff --git a/kernel_module/test/Makefile b/kernel_module/user/Makefile
similarity index 89%
rename from kernel_module/test/Makefile
rename to kernel_module/user/Makefile
index 967dd33..2935ca9 100644
--- a/kernel_module/test/Makefile
+++ b/kernel_module/user/Makefile
@@ -1,5 +1,3 @@
-CC = gcc
-
 .PHONY: clean
 
 ins_rm_mod: ins_rm_mod.c
diff --git a/kernel_module/test/README.md b/kernel_module/user/README.md
similarity index 77%
rename from kernel_module/test/README.md
rename to kernel_module/user/README.md
index 10ee2a8..dd0043a 100644
--- a/kernel_module/test/README.md
+++ b/kernel_module/user/README.md
@@ -1,6 +1,6 @@
-# Test
+# User
 
-Userland C programs used to test our kernel module.
+Userland C programs used to test our kernel modules.
 
 `sh` programs are simpler, and installed copied directly with an overlay.
 
diff --git a/kernel_module/user/ins_rm_mod b/kernel_module/user/ins_rm_mod
new file mode 100755
index 0000000..ec06ba5
Binary files /dev/null and b/kernel_module/user/ins_rm_mod differ
diff --git a/kernel_module/test/ins_rm_mod.c b/kernel_module/user/ins_rm_mod.c
similarity index 100%
rename from kernel_module/test/ins_rm_mod.c
rename to kernel_module/user/ins_rm_mod.c