diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15eb1817aa7b87e751910ed85a6d12939b1eff53..c8ad791e044e352b9a0ab31c240b9173bbaa3e09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -302,6 +302,7 @@ set(TESTS
         db/flush_job_test.cc
         db/listener_test.cc
         db/log_test.cc
+        db/manual_compaction_test.cc
         db/memtable_list_test.cc
         db/merge_test.cc
         db/merge_helper_test.cc
@@ -342,7 +343,6 @@ set(TESTS
         util/heap_test.cc
         util/histogram_test.cc
         util/ldb_cmd_test.cc
-        util/manual_compaction_test.cc
         util/memenv_test.cc
         util/mock_env_test.cc
         util/options_test.cc
diff --git a/Makefile b/Makefile
index d4ccb0df8d72777ae619927d8eb3e5ea4426a9d4..b4ccc1dc551acf38fb2cc306c6efee8d125d6872 100644
--- a/Makefile
+++ b/Makefile
@@ -916,7 +916,7 @@ optimistic_transaction_test: utilities/transactions/optimistic_transaction_test.
 mock_env_test : util/mock_env_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
-manual_compaction_test: util/manual_compaction_test.o $(LIBOBJECTS) $(TESTHARNESS)
+manual_compaction_test: db/manual_compaction_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)
 
 filelock_test: util/filelock_test.o $(LIBOBJECTS) $(TESTHARNESS)
diff --git a/util/manual_compaction_test.cc b/db/manual_compaction_test.cc
similarity index 100%
rename from util/manual_compaction_test.cc
rename to db/manual_compaction_test.cc
diff --git a/src.mk b/src.mk
index 39f9c1fa76b2ecfbc2bf57454723417c9ac02c7f..717bbae2096e6ed4ddffb76f88097a640770ba93 100644
--- a/src.mk
+++ b/src.mk
@@ -198,6 +198,7 @@ TEST_BENCH_SOURCES =                                                    \
   db/listener_test.cc                                                   \
   db/log_and_apply_bench.cc                                             \
   db/log_test.cc                                                        \
+  db/manual_compaction_test.cc                                          \
   db/memtablerep_bench.cc                                               \
   db/merge_test.cc                                                      \
   db/perf_context_test.cc                                               \
@@ -252,7 +253,6 @@ TEST_BENCH_SOURCES =                                                    \
   utilities/ttl/ttl_test.cc                                             \
   utilities/write_batch_with_index/write_batch_with_index_test.cc       \
   util/log_write_bench.cc                                               \
-  util/manual_compaction_test.cc                                        \
   util/memenv_test.cc                                                   \
   util/mock_env_test.cc                                                 \
   util/options_test.cc                                                  \