diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b5f03a0f..7cb4cc7a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -623,6 +623,7 @@ set(SOURCES
         tools/ldb_tool.cc
         tools/sst_dump_tool.cc
         tools/trace_analyzer_tool.cc
+        trace_replay/trace_replay.cc
         util/bloom.cc
         util/coding.cc
         util/compaction_job_stats_impl.cc
@@ -642,7 +643,6 @@ set(SOURCES
         util/string_util.cc
         util/thread_local.cc
         util/threadpool_imp.cc
-        util/trace_replay.cc
         util/xxhash.cc
         utilities/backupable/backupable_db.cc
         utilities/blob_db/blob_compaction_filter.cc
diff --git a/TARGETS b/TARGETS
index da4f4d9a6..a635ed5ac 100644
--- a/TARGETS
+++ b/TARGETS
@@ -221,6 +221,7 @@ cpp_library(
         "tools/ldb_cmd.cc",
         "tools/ldb_tool.cc",
         "tools/sst_dump_tool.cc",
+        "trace_replay/trace_replay.cc",
         "util/bloom.cc",
         "util/build_version.cc",
         "util/coding.cc",
@@ -241,7 +242,6 @@ cpp_library(
         "util/string_util.cc",
         "util/thread_local.cc",
         "util/threadpool_imp.cc",
-        "util/trace_replay.cc",
         "util/xxhash.cc",
         "utilities/backupable/backupable_db.cc",
         "utilities/blob_db/blob_compaction_filter.cc",
diff --git a/db/db_impl/db_impl.h b/db/db_impl/db_impl.h
index 5461ef300..f73e8665f 100644
--- a/db/db_impl/db_impl.h
+++ b/db/db_impl/db_impl.h
@@ -53,12 +53,12 @@
 #include "rocksdb/transaction_log.h"
 #include "rocksdb/write_buffer_manager.h"
 #include "table/scoped_arena_iterator.h"
+#include "trace_replay/trace_replay.h"
 #include "util/autovector.h"
 #include "util/hash.h"
 #include "util/repeatable_thread.h"
 #include "util/stop_watch.h"
 #include "util/thread_local.h"
-#include "util/trace_replay.h"
 
 namespace rocksdb {
 
diff --git a/db/db_iter.cc b/db/db_iter.cc
index bcfed2bb0..29a1a9eac 100644
--- a/db/db_iter.cc
+++ b/db/db_iter.cc
@@ -26,9 +26,9 @@
 #include "rocksdb/options.h"
 #include "table/internal_iterator.h"
 #include "table/iterator_wrapper.h"
+#include "trace_replay/trace_replay.h"
 #include "util/mutexlock.h"
 #include "util/string_util.h"
-#include "util/trace_replay.h"
 #include "util/user_comparator_wrapper.h"
 
 namespace rocksdb {
diff --git a/src.mk b/src.mk
index 38835f8c6..c172d0b2c 100644
--- a/src.mk
+++ b/src.mk
@@ -142,6 +142,7 @@ LIB_SOURCES =                                                   \
   test_util/sync_point_impl.cc                                  \
   test_util/transaction_test_util.cc                            \
   tools/dump/db_dump_tool.cc                                    \
+  trace_replay/trace_replay.cc                                  \
   util/bloom.cc                                                 \
   util/build_version.cc                                         \
   util/coding.cc                                                \
@@ -162,7 +163,6 @@ LIB_SOURCES =                                                   \
   util/string_util.cc                                           \
   util/thread_local.cc                                          \
   util/threadpool_imp.cc                                        \
-  util/trace_replay.cc                                          \
   util/xxhash.cc                                                \
   utilities/backupable/backupable_db.cc                         \
   utilities/blob_db/blob_compaction_filter.cc                   \
diff --git a/tools/trace_analyzer_test.cc b/tools/trace_analyzer_test.cc
index 7c242f60f..dcc954384 100644
--- a/tools/trace_analyzer_test.cc
+++ b/tools/trace_analyzer_test.cc
@@ -30,7 +30,7 @@ int main() {
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "tools/trace_analyzer_tool.h"
-#include "util/trace_replay.h"
+#include "trace_replay/trace_replay.h"
 
 namespace rocksdb {
 
diff --git a/tools/trace_analyzer_tool.cc b/tools/trace_analyzer_tool.cc
index 93528c006..6ab606f6a 100644
--- a/tools/trace_analyzer_tool.cc
+++ b/tools/trace_analyzer_tool.cc
@@ -44,13 +44,13 @@
 #include "table/plain/plain_table_factory.h"
 #include "table/table_reader.h"
 #include "tools/trace_analyzer_tool.h"
+#include "trace_replay/trace_replay.h"
 #include "util/coding.h"
 #include "util/compression.h"
 #include "util/file_reader_writer.h"
 #include "util/gflags_compat.h"
 #include "util/random.h"
 #include "util/string_util.h"
-#include "util/trace_replay.h"
 
 using GFLAGS_NAMESPACE::ParseCommandLineFlags;
 using GFLAGS_NAMESPACE::RegisterFlagValidator;
diff --git a/tools/trace_analyzer_tool.h b/tools/trace_analyzer_tool.h
index be96f5005..4c3b973b7 100644
--- a/tools/trace_analyzer_tool.h
+++ b/tools/trace_analyzer_tool.h
@@ -16,7 +16,7 @@
 #include "rocksdb/env.h"
 #include "rocksdb/trace_reader_writer.h"
 #include "rocksdb/write_batch.h"
-#include "util/trace_replay.h"
+#include "trace_replay/trace_replay.h"
 
 namespace rocksdb {
 
diff --git a/util/trace_replay.cc b/trace_replay/trace_replay.cc
similarity index 99%
rename from util/trace_replay.cc
rename to trace_replay/trace_replay.cc
index 9e0e8c48c..f9448069b 100644
--- a/util/trace_replay.cc
+++ b/trace_replay/trace_replay.cc
@@ -3,7 +3,7 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 
-#include "util/trace_replay.h"
+#include "trace_replay/trace_replay.h"
 
 #include <chrono>
 #include <sstream>
diff --git a/util/trace_replay.h b/trace_replay/trace_replay.h
similarity index 100%
rename from util/trace_replay.h
rename to trace_replay/trace_replay.h
diff --git a/utilities/trace/file_trace_reader_writer.cc b/utilities/trace/file_trace_reader_writer.cc
index 4a81516a8..d8e36c312 100644
--- a/utilities/trace/file_trace_reader_writer.cc
+++ b/utilities/trace/file_trace_reader_writer.cc
@@ -5,9 +5,9 @@
 
 #include "utilities/trace/file_trace_reader_writer.h"
 
+#include "trace_replay/trace_replay.h"
 #include "util/coding.h"
 #include "util/file_reader_writer.h"
-#include "util/trace_replay.h"
 
 namespace rocksdb {