diff --git a/makefiles/pseudomodules.inc.mk b/makefiles/pseudomodules.inc.mk
index 8ac0fba286..777b7dd03d 100644
--- a/makefiles/pseudomodules.inc.mk
+++ b/makefiles/pseudomodules.inc.mk
@@ -119,6 +119,7 @@ PSEUDOMODULES += printf_float
 PSEUDOMODULES += prng
 PSEUDOMODULES += prng_%
 PSEUDOMODULES += fortuna_reseed
+PSEUDOMODULES += random_cmd
 PSEUDOMODULES += riotboot_%
 PSEUDOMODULES += rtt_cmd
 PSEUDOMODULES += saul_adc
diff --git a/sys/shell/commands/Makefile b/sys/shell/commands/Makefile
index 1ceaf16de0..91bcb933d4 100644
--- a/sys/shell/commands/Makefile
+++ b/sys/shell/commands/Makefile
@@ -29,7 +29,7 @@ endif
 ifneq (,$(filter lpc2387,$(USEMODULE)))
   SRC += sc_heap.c
 endif
-ifneq (,$(filter random,$(USEMODULE)))
+ifneq (,$(filter random_cmd,$(USEMODULE)))
   SRC += sc_random.c
 endif
 ifneq (,$(filter at30tse75x,$(USEMODULE)))
diff --git a/sys/shell/commands/shell_commands.c b/sys/shell/commands/shell_commands.c
index d3d8b97790..1f5d6171b8 100644
--- a/sys/shell/commands/shell_commands.c
+++ b/sys/shell/commands/shell_commands.c
@@ -86,7 +86,7 @@ extern int _gnrc_icmpv6_ping(int argc, char **argv);
 #endif
 #endif
 
-#ifdef MODULE_RANDOM
+#ifdef MODULE_RANDOM_CMD
 extern int _random_init(int argc, char **argv);
 extern int _random_get(int argc, char **argv);
 #endif
@@ -250,7 +250,7 @@ const shell_command_t _shell_command_list[] = {
     { "ping", "Alias for ping6", _gnrc_icmpv6_ping },
 #endif
 #endif
-#ifdef MODULE_RANDOM
+#ifdef MODULE_RANDOM_CMD
     { "random_init", "initializes the PRNG", _random_init },
     { "random_get", "returns 32 bit of pseudo randomness", _random_get },
 #endif
diff --git a/tests/rng/Makefile b/tests/rng/Makefile
index cffdc20aa8..127240b1d3 100644
--- a/tests/rng/Makefile
+++ b/tests/rng/Makefile
@@ -9,6 +9,7 @@ CFLAGS += -DTHREAD_STACKSIZE_MAIN=\($(MAIN_THREAD_SIZE)\)
 
 USEMODULE += fmt
 USEMODULE += random
+USEMODULE += random_cmd
 USEMODULE += shell
 USEMODULE += xtimer