diff --git a/unittests/ADT/Makefile b/unittests/ADT/Makefile
index fe0832894d3..c255a0b44d0 100644
--- a/unittests/ADT/Makefile
+++ b/unittests/ADT/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ../..
 TESTNAME = ADT
-LINK_COMPONENTS := core support
+LINK_COMPONENTS := support
 
 include $(LEVEL)/Makefile.config
 
diff --git a/unittests/ADT/ValueMapTest.cpp b/unittests/VMCore/ValueMapTest.cpp
similarity index 100%
rename from unittests/ADT/ValueMapTest.cpp
rename to unittests/VMCore/ValueMapTest.cpp