diff --git a/CMake/EdenConfigChecks.cmake b/CMake/EdenConfigChecks.cmake
index 38314ab59da7c..64b47cd17a4c1 100644
--- a/CMake/EdenConfigChecks.cmake
+++ b/CMake/EdenConfigChecks.cmake
@@ -110,6 +110,7 @@ endif()
 
 find_package(python-toml REQUIRED)
 find_package(python-filelock REQUIRED)
+find_package(python-psutil REQUIRED)
 
 # pexpect is used by some of the integration tests.
 # If we don't find it we simply won't run those tests.
diff --git a/build/fbcode_builder/manifests/eden b/build/fbcode_builder/manifests/eden
index d7bc911612e39..b6019422596d2 100644
--- a/build/fbcode_builder/manifests/eden
+++ b/build/fbcode_builder/manifests/eden
@@ -27,6 +27,7 @@ rocksdb
 re2
 libgit2
 pexpect
+python-psutil
 python-toml
 python-filelock
 edencommon
diff --git a/build/fbcode_builder/manifests/python-psutil b/build/fbcode_builder/manifests/python-psutil
new file mode 100644
index 0000000000000..921781fc09c33
--- /dev/null
+++ b/build/fbcode_builder/manifests/python-psutil
@@ -0,0 +1,10 @@
+[manifest]
+name = python-psutil
+
+[download]
+url = https://files.pythonhosted.org/packages/bf/b9/b0eb3f3cbcb734d930fdf839431606844a825b23eaf9a6ab371edac8162c/psutil-7.0.0-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+sha256 = 4b1388a4f6875d7e2aff5c4ca1cc16c545ed41dd8bb596cefea80111db353a34
+
+[build]
+builder = python-wheel
+
diff --git a/eden/integration/CMakeLists.txt b/eden/integration/CMakeLists.txt
index de6e0ca95812d..1b623fd018c94 100644
--- a/eden/integration/CMakeLists.txt
+++ b/eden/integration/CMakeLists.txt
@@ -42,14 +42,25 @@ if(NOT pexpect_FOUND)
   )
 endif()
 
+find_package(FBThrift CONFIG REQUIRED)
+
 add_fb_python_unittest(
-  integration_tests
+  integration_tests.egg
+  TYPE "pex"
   SOURCES ${INTEGRATION_SRCS}
   WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
   DEPENDS
     edenfsctl.real.main_lib
     eden_integration_lib
     eden_hg_integration_lib
+    python-psutil::python-psutil
+    FBThrift::thrift_python_cpp
+    Folly::folly_python_cpp
+  NORMAL_DEPENDS
+    FBThrift::thriftcpp2
+    Folly::folly
+    fmt::fmt
+    glog::glog
   ENV
     "CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}"
 )
diff --git a/eden/integration/hg/CMakeLists.txt b/eden/integration/hg/CMakeLists.txt
index 9d7e0cf12dcff..b94cce0576088 100644
--- a/eden/integration/hg/CMakeLists.txt
+++ b/eden/integration/hg/CMakeLists.txt
@@ -8,12 +8,23 @@ list(REMOVE_ITEM HG_INTEGRATION_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/eden_journal_test.py
 )
 
+find_package(FBThrift CONFIG REQUIRED)
+
 add_fb_python_unittest(
-  hg_integration_tests
+  hg_integration_tests.egg
+  TYPE "pex"
   SOURCES ${HG_INTEGRATION_SRCS}
   WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
   DEPENDS
+    FBThrift::thrift_python_cpp
+    Folly::folly_python_cpp
+    eden_config_thrift_py
     eden_hg_integration_lib
+  NORMAL_DEPENDS
+    FBThrift::thriftcpp2
+    Folly::folly
+    fmt::fmt
+    glog::glog
   ENV
     "CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}"
 )