diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake
index 46d3a1b4cb8..b05490e1224 100644
--- a/cmake/modules/AddCephTest.cmake
+++ b/cmake/modules/AddCephTest.cmake
@@ -56,7 +56,6 @@ endfunction()
 
 function(add_tox_test name)
   set(test_name run-tox-${name})
-  set(venv_path ${CEPH_BUILD_VIRTUALENV}/${name}-virtualenv)
   cmake_parse_arguments(TOXTEST "" "TOX_PATH" "TOX_ENVS" ${ARGN})
   if(DEFINED TOXTEST_TOX_PATH)
     set(tox_path ${TOXTEST_TOX_PATH})
@@ -69,27 +68,13 @@ function(add_tox_test name)
     list(APPEND tox_envs py3)
   endif()
   string(REPLACE ";" "," tox_envs "${tox_envs}")
-  add_test(
-    NAME setup-venv-for-${name}
-    COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python3_EXECUTABLE} ${venv_path}
-    WORKING_DIRECTORY ${tox_path})
-  set_tests_properties(setup-venv-for-${name} PROPERTIES
-    FIXTURES_SETUP venv-for-${name})
-  add_test(
-    NAME teardown-venv-for-${name}
-    COMMAND ${CMAKE_COMMAND} -E remove_directory ${venv_path})
-  set_tests_properties(teardown-venv-for-${name} PROPERTIES
-    FIXTURES_CLEANUP venv-for-${name})
   add_test(
     NAME ${test_name}
     COMMAND ${CMAKE_SOURCE_DIR}/src/script/run_tox.sh
               --source-dir ${CMAKE_SOURCE_DIR}
               --build-dir ${CMAKE_BINARY_DIR}
               --tox-path ${tox_path}
-              --tox-envs ${tox_envs}
-              --venv-path ${venv_path})
-  set_tests_properties(${test_name} PROPERTIES
-    FIXTURES_REQUIRED venv-for-${name})
+              --tox-envs ${tox_envs})
   set_property(
     TEST ${test_name}
     PROPERTY ENVIRONMENT
diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt
index 9166553dc73..9a6c87595b9 100644
--- a/src/ceph-volume/CMakeLists.txt
+++ b/src/ceph-volume/CMakeLists.txt
@@ -8,22 +8,6 @@ if(FREEBSD)
   add_subdirectory(plugin/zfs)
 endif()
 
-# Required for running ceph-volume inventory in a vstart environment
-set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv)
-
-add_custom_command(
-  OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python
-  COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python3_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV}
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
-  COMMENT "ceph-volume venv is being created")
-
-add_custom_command(
-  OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume
-  DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python
-  COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
-  COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume")
-
 add_custom_target(ceph-volume-venv-setup
   DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume)