diff --git a/test/e2e/features/basic.feature b/test/e2e/features/basic.feature
index c28cb50778..b728163530 100644
--- a/test/e2e/features/basic.feature
+++ b/test/e2e/features/basic.feature
@@ -35,7 +35,6 @@ Feature: Basic test
         * setting config property "enable-cluster-monitoring" to value "true" succeeds
         * setting config property "memory" to value "16000" succeeds
         Given executing single crc setup command succeeds
-        And executing "man -P cat crc" succeeds
         When starting CRC with default bundle succeeds
         Then stdout should contain "Started the OpenShift cluster"
         # Check if user can copy-paste login details for developer and kubeadmin users
@@ -74,4 +73,3 @@ Feature: Basic test
         And kubeconfig is cleaned up
         # cleanup
         When executing crc cleanup command succeeds
-        And executing "man -P cat crc" fails
diff --git a/test/e2e/features/manpages.feature b/test/e2e/features/manpages.feature
new file mode 100644
index 0000000000..7f7a824720
--- /dev/null
+++ b/test/e2e/features/manpages.feature
@@ -0,0 +1,58 @@
+@story_manpages
+Feature: Check generation and cleanup of manpages
+
+  @linux @darwin
+  Scenario Outline: verify man pages are accessible after setup
+    Given executing single crc setup command succeeds
+    And executing "export MANPATH=$HOME/.local/share/man:$MANPATH" succeeds
+    Then executing "man -P cat 1 <crc-subcommand>" succeeds
+
+    @linux @darwin
+    Examples: Man pages to check
+      | crc-subcommand       |
+      | crc                  |
+      | crc-bundle-generate  |
+      | crc-config           |
+      | crc-start            |
+      | crc-bundle           |
+      | crc-console          |
+      | crc-status           |
+      | crc-cleanup          |
+      | crc-delete           |
+      | crc-stop             |
+      | crc-config-get       |
+      | crc-ip               |
+      | crc-version          |
+      | crc-config-set       |
+      | crc-oc-env           |
+      | crc-config-unset     |
+      | crc-podman-env       |
+      | crc-config-view      |
+      | crc-setup            |
+
+  Scenario Outline: verify man pages are NOT accessible after cleanup
+    Given executing crc cleanup command succeeds
+    Then executing "man -P cat 1 <crc-subcommand>" fails
+
+    @linux @darwin
+    Examples: Man pages to check
+      | crc-subcommand       |
+      | crc                  |
+      | crc-bundle-generate  |
+      | crc-config           |
+      | crc-start            |
+      | crc-bundle           |
+      | crc-console          |
+      | crc-status           |
+      | crc-cleanup          |
+      | crc-delete           |
+      | crc-stop             |
+      | crc-config-get       |
+      | crc-ip               |
+      | crc-version          |
+      | crc-config-set       |
+      | crc-oc-env           |
+      | crc-config-unset     |
+      | crc-podman-env       |
+      | crc-config-view      |
+      | crc-setup            |
\ No newline at end of file