diff --git a/aruba-disable-test-that-do-not-actually-test-output.patch b/aruba-disable-test-that-do-not-actually-test-output.patch
new file mode 100644
index 0000000..d4e639c
--- /dev/null
+++ b/aruba-disable-test-that-do-not-actually-test-output.patch
@@ -0,0 +1,43 @@
+commit 3f8ed748d73fa9d39fe163f14540a7ef2a53a5c1
+Author: Jarl Friis <jarl@softace.dk>
+Date:   Fri Oct 12 23:28:31 2012 +0200
+
+    These tests are actually not testing output from the process anyway, because the process is actually never started.
+
+diff --git a/features/exit_statuses.feature b/features/exit_statuses.feature
+index 5c5dffe..b971152 100644
+--- a/features/exit_statuses.feature
++++ b/features/exit_statuses.feature
+@@ -30,13 +30,3 @@ Feature: exit statuses
+   Scenario: Unsuccessfully run something
+     When I do aruba I successfully run `ruby -e 'exit 10'`
+     Then aruba should fail with "Exit status was 10"
+-
+-  @posix
+-  Scenario: Try to run something that doesn't exist
+-    When I run `does_not_exist`
+-    Then the exit status should be 1
+-
+-  @posix
+-  Scenario: Try to run something that doesn't exist with `
+-    When I run `does_not_exist`
+-    Then the exit status should be 1
+diff --git a/features/output.feature b/features/output.feature
+index 35b931d..f577d26 100644
+--- a/features/output.feature
++++ b/features/output.feature
+@@ -5,14 +5,6 @@ Feature: Output
+   I want to use the "the output should contain" step
+ 
+   @posix
+-  Scenario: Run unknown command
+-    When I run `neverever gonna work`
+-    Then the output should contain:
+-      """
+-      No such file or directory - neverever
+-      """
+-
+-  @posix
+   Scenario: Detect subset of one-line output
+     When I run `ruby -e 'puts \"hello world\"'`
+     Then the output should contain "hello world"
diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec
index a4ec34c..e6e46d6 100644
--- a/rubygem-aruba.spec
+++ b/rubygem-aruba.spec
@@ -5,7 +5,7 @@
 Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba
 Name: rubygem-%{gem_name}
 Version: 0.4.11
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Development/Languages
 # aruba itself is MIT
 # icons in templates/images are CC-BY
@@ -15,6 +15,8 @@ License: MIT and CC-BY and (MIT or GPLv2) and (MIT or BSD or GPLv2)
 URL: http://github.com/cucumber/aruba
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
 Patch0: aruba-downgrade-childprocess-dependency.patch
+# https://github.com/cucumber/aruba/commit/3f8ed748d73fa9d39fe163f14540a7ef2a53a5c1
+Patch1: aruba-disable-test-that-do-not-actually-test-output.patch
 Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems) 
 Requires: rubygem(cucumber) >= 1.1.1
@@ -58,6 +60,10 @@ pushd .%{gem_dir}
 %patch0 -p0
 popd
 
+pushd .%{gem_instdir}
+%patch1 -p1
+popd
+
 %build
 
 %install
@@ -68,6 +74,8 @@ cp -a .%{gem_dir}/* \
 %check
 pushd .%{gem_instdir}
 cucumber
+# fix wrong parameter for Process.new (already fixed upstream)
+sed -i 's|0, |0.1, |' spec/aruba/process_spec.rb
 rspec spec
 popd
 
@@ -94,6 +102,9 @@ popd
 %{gem_instdir}/templates
 
 %changelog
+* Mon Feb 18 2013 Bohuslav Kabrda <bkabrda@redhat.com> - 0.4.11-5
+- Disable tests that do not actually test anything (patch from upstream).
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild