diff --git a/lldb/unittests/Core/CMakeLists.txt b/lldb/unittests/Core/CMakeLists.txt
index b40e7093a850..1d3ce6f2084f 100644
--- a/lldb/unittests/Core/CMakeLists.txt
+++ b/lldb/unittests/Core/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_lldb_unittest(LLDBCoreTests
   BroadcasterTest.cpp
-  DataExtractorTest.cpp
   EventTest.cpp
   ListenerTest.cpp
   MangledTest.cpp
diff --git a/lldb/unittests/Utility/CMakeLists.txt b/lldb/unittests/Utility/CMakeLists.txt
index 5d38a522a72e..f0ff1527ec21 100644
--- a/lldb/unittests/Utility/CMakeLists.txt
+++ b/lldb/unittests/Utility/CMakeLists.txt
@@ -6,6 +6,7 @@ add_lldb_unittest(UtilityTests
   CleanUpTest.cpp
   ConstStringTest.cpp
   CompletionRequestTest.cpp
+  DataExtractorTest.cpp
   EnvironmentTest.cpp
   FileSpecTest.cpp
   FlagsTest.cpp
diff --git a/lldb/unittests/Core/DataExtractorTest.cpp b/lldb/unittests/Utility/DataExtractorTest.cpp
similarity index 100%
rename from lldb/unittests/Core/DataExtractorTest.cpp
rename to lldb/unittests/Utility/DataExtractorTest.cpp