diff --git a/test/features/completions.feature b/test/features/completions.feature
index feaaa6f..0024bbe 100644
--- a/test/features/completions.feature
+++ b/test/features/completions.feature
@@ -125,6 +125,35 @@ Feature: Shell Completion
             | 'ant '        | 1.10.1, 1.9.9 | /^\w+$/       |
             | 'ant 1.10.1 ' |               | /.*/          |
 
+    Scenario Outline: Completion for 'home'
+        When the user enters "home <cmd>" into the prompt
+        Then completion should propose "<completions>"
+        But  completion should not propose <exclusions>
+        Examples:
+            | cmd           | completions   | exclusions    |
+            |               | ant, crash    | gradle        |
+            | an            | ant           | crash, gradle |
+            | j             |               | /.*/          |
+            | 1.            |               | /.*/          |
+            | 'ant '        | 1.10.1, 1.9.9 | /^\w+$/       |
+            | 'ant 1.10.1 ' |               | /.*/          |
+
+    Scenario Outline: Completion for 'env'
+        When the user enters "env <cmd>" into the prompt
+        Then completion should propose "<completions>"
+        But  completion should not propose <exclusions>
+        Examples:
+            | cmd           | completions             | exclusions                      |
+            |               | init, install, clear    | /^(?!init\|install\|clear).*$/  |
+            | i             | init, install           | /^(?!init\|install).*$/         |
+            | ini           | init                    | /^(?!init).*$/                  |
+            | ins           | install                 | /^(?!install).*$/               |
+            | c             | clear                   | /^(?!clear).*$/                 |
+            | a             |                         | /.*/                            |
+            | 'init '       |                         | /.*/                            |
+            | 'clear '      |                         | /.*/                            |
+            | 'install '    |                         | /.*/                            |
+
     Scenario Outline: Completion for 'current'
         When the user enters "current <cmd>" into the prompt
         Then completion should propose "<completions>"
@@ -186,30 +215,6 @@ Feature: Shell Completion
             | x       |                                   | /.*/                                        |
             | 'tmp '  |                                   | /.*/                                        |
 
-    Scenario Outline: Completion for 'home'
-        When the user enters "home <cmd>" into the prompt
-        Then completion should propose "<completions>"
-        But  completion should not propose <exclusions>
-        Examples:
-            | cmd           | completions   | exclusions    |
-            |               | ant, crash    | gradle        |
-            | an            | ant           | crash, gradle |
-            | j             |               | /.*/          |
-            | 1.            |               | /.*/          |
-            | 'ant '        | 1.10.1, 1.9.9 | /^\w+$/       |
-            | 'ant 1.10.1 ' |               | /.*/          |
-
-    Scenario Outline: Completion for 'env'
-        When the user enters "env <cmd>" into the prompt
-        Then completion should propose "<completions>"
-        But  completion should not propose <exclusions>
-        Examples:
-            | cmd     | completions | exclusions     |
-            |         | init        | /^(?!init).*$/ |
-            | i       | init        | /^(?!init).*$/ |
-            | a       |             | /.*/           |
-            | 'init ' |             | /.*/           |
-
     Scenario Outline: Completion for commands without parameters
         When the user enters "<cmd>" into the prompt
         Then completion should not propose /.*/
diff --git a/test/features/wrapper.feature b/test/features/wrapper.feature
index 3e3304f..2bb6a3e 100644
--- a/test/features/wrapper.feature
+++ b/test/features/wrapper.feature
@@ -34,3 +34,4 @@ Feature: Wrapping of Bash
             | sdk use ant 1.9.9 > /dev/null; sdk broadcast        |
             | sdk home ant 1.9.9                                  |
             | cd /tmp/env-test; sdk env                           |
+            | cd /tmp/env-test; sdk env; sdk env clear            |