diff --git a/features/actions/file_append.feature b/features/actions/file_append.feature
index efefd6a..09bf541 100644
--- a/features/actions/file_append.feature
+++ b/features/actions/file_append.feature
@@ -1,4 +1,4 @@
-@sshd
+@sshd @mocked_home_directory
 Feature: `file_append' task action
 
   Background:
diff --git a/features/actions/file_replace_content.feature b/features/actions/file_replace_content.feature
index edaa021..36878d0 100644
--- a/features/actions/file_replace_content.feature
+++ b/features/actions/file_replace_content.feature
@@ -1,4 +1,4 @@
-@sshd
+@sshd @mocked_home_directory
 Feature: `file_replace_content' task action
 
   Background:
diff --git a/features/actions/file_write.feature b/features/actions/file_write.feature
index f067dda..17c0646 100644
--- a/features/actions/file_write.feature
+++ b/features/actions/file_write.feature
@@ -1,4 +1,4 @@
-@sshd
+@sshd @mocked_home_directory
 Feature: `file_write' task action
 
   Background:
diff --git a/features/actions/mkdir.feature b/features/actions/mkdir.feature
index 393ad9b..5bd5cd2 100644
--- a/features/actions/mkdir.feature
+++ b/features/actions/mkdir.feature
@@ -1,4 +1,4 @@
-@sshd
+@sshd @mocked_home_directory
 Feature: `mkdir' task action
 
   Background:
diff --git a/features/actions/sh.feature b/features/actions/sh.feature
index eceb3c1..9e5c2ea 100644
--- a/features/actions/sh.feature
+++ b/features/actions/sh.feature
@@ -1,4 +1,4 @@
-@sshd
+@sshd @mocked_home_directory
 Feature: `sh' task action
 
   Scenario: forwards standard ouput
diff --git a/features/actions/yaml_write.feature b/features/actions/yaml_write.feature
index b20371e..6611ec3 100644
--- a/features/actions/yaml_write.feature
+++ b/features/actions/yaml_write.feature
@@ -1,4 +1,4 @@
-@sshd
+@sshd @mocked_home_directory
 Feature: `yaml_write' task action
 
   Background:
diff --git a/features/recipe/test_macro.feature b/features/recipe/test_macro.feature
index c426b16..c9b000b 100644
--- a/features/recipe/test_macro.feature
+++ b/features/recipe/test_macro.feature
@@ -18,7 +18,7 @@ Feature: `test_macro' recipe keyword
     Then the output must contain "2"
     And the output must not contain "1"
 
-  @sshd
+  @sshd @mocked_home_directory
   Scenario: has access to core tests
     Given a recipe with:
       """
diff --git a/producer-core.gemspec b/producer-core.gemspec
index 932b78c..4d49ece 100644
--- a/producer-core.gemspec
+++ b/producer-core.gemspec
@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec',         '~> 3.1'
   s.add_development_dependency 'cucumber',      '~> 2.0'
   s.add_development_dependency 'aruba',         '~> 0.5'
-  s.add_development_dependency 'cucumber-sshd', '~> 0.1'
+  s.add_development_dependency 'cucumber-sshd', '~> 1.0'
   s.add_development_dependency 'rake',          '~> 10.1'
 end