diff --git a/aruba/features/config/enroll.feature b/aruba/features/config/enroll.feature
index 803ecc46..7aea59e9 100644
--- a/aruba/features/config/enroll.feature
+++ b/aruba/features/config/enroll.feature
@@ -1,30 +1,30 @@
-Feature: Enrolling certificates with -config option
-
-  As a user, I want my new -config option to be working with `enroll` action with TPP, Cloud and Test-mode endpoints
-
-  Background:
-    Given the default aruba exit timeout is 180 seconds
-    And I have file named "tpp.ini" with TPP connection details
-    And I have file named "tpp-deprecated.ini" with TPPdeprecated connection details
-    And I have file named "test.ini" with test-mode connection details
-    And I have file named "cloud.ini" with Cloud connection details
-
-  Scenario Outline: Where it enrolls a certificate using different endpoints
-    When I try to run `vcert enroll -config <config-file> -cn cfg.venafi.example.com -no-prompt -insecure`
-    Then it should retrieve certificate
-
-    @FAKE
-    Examples:
-      | config-file |
-      | test.ini    |
-
-    @TPP
-    Examples:
-      | config-file |
-      | tpp.ini     |
-      |tpp-deprecated.ini|
-
-    @VAAS
-    Examples:
-      | config-file |
-      | cloud.ini   |
+# Feature: Enrolling certificates with -config option
+#
+#   As a user, I want my new -config option to be working with `enroll` action with TPP, Cloud and Test-mode endpoints
+#
+#   Background:
+#     Given the default aruba exit timeout is 180 seconds
+#     And I have file named "tpp.ini" with TPP connection details
+#     And I have file named "tpp-deprecated.ini" with TPPdeprecated connection details
+#     And I have file named "test.ini" with test-mode connection details
+#     And I have file named "cloud.ini" with Cloud connection details
+#
+#   Scenario Outline: Where it enrolls a certificate using different endpoints
+#     When I try to run `vcert enroll -config <config-file> -cn cfg.venafi.example.com -no-prompt -insecure`
+#     Then it should retrieve certificate
+#
+#     @FAKE
+#     Examples:
+#       | config-file |
+#       | test.ini    |
+#
+#     @TPP
+#     Examples:
+#       | config-file |
+#       | tpp.ini     |
+#       |tpp-deprecated.ini|
+#
+#     @VAAS
+#     Examples:
+#       | config-file |
+#       | cloud.ini   |
diff --git a/aruba/features/enroll/enroll-with-csr-PS-tests.feature b/aruba/features/enroll/enroll-with-csr-PS-tests.feature
index 7217f9a7..53357058 100644
--- a/aruba/features/enroll/enroll-with-csr-PS-tests.feature
+++ b/aruba/features/enroll/enroll-with-csr-PS-tests.feature
@@ -129,13 +129,13 @@ Feature: few more tests from Ryan
 # VCert enroll -tpp-url %TPP_URL% -tpp-user %TPP_USER% -tpp-password %TPP_PASS% -z "%POLICY%" -csr file:user-provided-full-subject.req
 # if ERRORLEVEL 1 goto :DONE
 # timeout /t 10
-  Scenario: ~ User Provided CSR with full Subject DN ~
-    Given I generate CSR using dummy password with flags -cn user-provided-full-subject.vcert.example -ou "DevOps Integrations" -o "Swordfish Security" -l "St. Petersburg" -st Russia -c RU -key-file user-provided-full-subject.key -csr-file user-provided-full-subject.req
-    And I enroll certificate using TPP with -csr file:user-provided-full-subject.req -format json
-    And I get JSON response
-    Then that certificate Subject should contain "C = RU"
-    And that certificate Subject should contain "ST = Russia"
-    And that certificate Subject should contain "L = St. Petersburg"
-    And that certificate Subject should contain "O = Swordfish Security"
-    And that certificate Subject should contain "OU = DevOps Integrations"
-    And that certificate Subject should contain "CN = user-provided-full-subject.vcert.example"
+#   Scenario: ~ User Provided CSR with full Subject DN ~
+#     Given I generate CSR using dummy password with flags -cn user-provided-full-subject.vcert.example -ou "DevOps Integrations" -o "Swordfish Security" -l "St. Petersburg" -st Russia -c RU -key-file user-provided-full-subject.key -csr-file user-provided-full-subject.req
+#     And I enroll certificate using TPP with -csr file:user-provided-full-subject.req -format json
+#     And I get JSON response
+#     Then that certificate Subject should contain "C = RU"
+#     And that certificate Subject should contain "ST = Russia"
+#     And that certificate Subject should contain "L = St. Petersburg"
+#     And that certificate Subject should contain "O = Swordfish Security"
+#     And that certificate Subject should contain "OU = DevOps Integrations"
+#     And that certificate Subject should contain "CN = user-provided-full-subject.vcert.example"