diff --git a/src/tools/cephfs/CMakeLists.txt b/src/tools/cephfs/CMakeLists.txt
index 7449e3704b0..5d40f8ffb17 100644
--- a/src/tools/cephfs/CMakeLists.txt
+++ b/src/tools/cephfs/CMakeLists.txt
@@ -49,12 +49,7 @@ install(TARGETS
 
 option(WITH_CEPHFS_SHELL "install cephfs-shell" OFF)
 if(WITH_CEPHFS_SHELL)
-  include(Distutils)
-  distutils_install_module(cephfs-shell)
-  if(WITH_TESTS)
-    include(AddCephTest)
-    add_tox_test(cephfs-shell)
-  endif()
+  add_subdirectory(shell)
 endif()
 
 option(WITH_CEPHFS_TOP "install cephfs-top utility" ON)
diff --git a/src/tools/cephfs/shell/CMakeLists.txt b/src/tools/cephfs/shell/CMakeLists.txt
new file mode 100644
index 00000000000..5a1f6ad8020
--- /dev/null
+++ b/src/tools/cephfs/shell/CMakeLists.txt
@@ -0,0 +1,7 @@
+include(Distutils)
+distutils_install_module(cephfs-shell)
+
+if(WITH_TESTS)
+  include(AddCephTest)
+  add_tox_test(cephfs-shell)
+endif()
diff --git a/src/tools/cephfs/cephfs-shell b/src/tools/cephfs/shell/cephfs-shell
similarity index 100%
rename from src/tools/cephfs/cephfs-shell
rename to src/tools/cephfs/shell/cephfs-shell
diff --git a/src/tools/cephfs/setup.py b/src/tools/cephfs/shell/setup.py
similarity index 100%
rename from src/tools/cephfs/setup.py
rename to src/tools/cephfs/shell/setup.py
diff --git a/src/tools/cephfs/tox.ini b/src/tools/cephfs/shell/tox.ini
similarity index 100%
rename from src/tools/cephfs/tox.ini
rename to src/tools/cephfs/shell/tox.ini