diff --git a/cmd/Makefile b/cmd/Makefile
index 49986437ba5803a819a1d7f2415f7d30c36337e2..15ae4d250f50a06a9b61d44dcee958475bd91160 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -40,6 +40,7 @@ obj-$(CONFIG_CMD_CPU) += cpu.o
 obj-$(CONFIG_DATAFLASH_MMC_SELECT) += dataflash_mmc_mux.o
 obj-$(CONFIG_CMD_DATE) += date.o
 obj-$(CONFIG_CMD_DEMO) += demo.o
+obj-$(CONFIG_CMD_DM) += dm.o
 obj-$(CONFIG_CMD_SOUND) += sound.o
 ifdef CONFIG_POST
 obj-$(CONFIG_CMD_DIAG) += diag.o
diff --git a/test/dm/cmd_dm.c b/cmd/dm.c
similarity index 100%
rename from test/dm/cmd_dm.c
rename to cmd/dm.c
diff --git a/test/dm/Makefile b/test/dm/Makefile
index 6b451060d8aebcacea8474b93b4c18e943e5da44..7dc80be25e366c820d9866e88ad5f5ec4f5cd940 100644
--- a/test/dm/Makefile
+++ b/test/dm/Makefile
@@ -2,7 +2,6 @@
 #
 # Copyright (c) 2013 Google, Inc
 
-obj-$(CONFIG_CMD_DM) += cmd_dm.o
 obj-$(CONFIG_UT_DM) += bus.o
 obj-$(CONFIG_UT_DM) += test-driver.o
 obj-$(CONFIG_UT_DM) += test-fdt.o