diff --git a/.gitmodules b/.gitmodules
index 80a75427..699b39f3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "features/cucumber-tck"]
 	path = features/cucumber-tck
-	url = git://github.com/cucumber/cucumber-tck.git
+	url = https://github.com/konserw/cucumber-tck.git 
diff --git a/Gemfile b/Gemfile
index 0357afa7..6a6a0374 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem 'cucumber', "=1.3.20"
-  gem 'aruba', "=0.6.1"
-  gem 'rspec', "=2.14.1"
+  gem 'cucumber', "=2.0.0"
+  gem 'aruba', "=0.8.0"
+  gem 'rspec', "=3.4.0"
 end
 
diff --git a/features/cucumber-tck b/features/cucumber-tck
index 7ea91477..217931ba 160000
--- a/features/cucumber-tck
+++ b/features/cucumber-tck
@@ -1 +1 @@
-Subproject commit 7ea91477edd14180ded92f7699d09689227644cd
+Subproject commit 217931ba817374672d9b8ee303a9a08091dfb178
diff --git a/features/step_definitions/cucumber_cpp_mappings.rb b/features/step_definitions/cucumber_cpp_mappings.rb
index 9dee4c36..fe961c8b 100644
--- a/features/step_definitions/cucumber_cpp_mappings.rb
+++ b/features/step_definitions/cucumber_cpp_mappings.rb
@@ -172,36 +172,34 @@ def assert_executed_scenarios *scenario_offsets
   end
 
   def assert_world_variable_held_value_at_time(value, time)
-    check_exact_file_content "#{WORLD_VARIABLE_LOG_FILE}.#{time}", value
+    expect(File.read("#{WORLD_VARIABLE_LOG_FILE}.#{time}")).to match value 
   end
 
   def assert_world_function_called
-    check_file_presence [WORLD_FUNCTION_LOG_FILE], true
+    expect(File.file?(WORLD_FUNCTION_LOG_FILE)).to be true
   end
 
   def assert_cycle_sequence *args
     expected_string = args.join CYCLE_SEQUENCE_SEPARATOR
-    check_file_content(CYCLE_LOG_FILE, expected_string, true)
+    expect(File.read(CYCLE_LOG_FILE)).to match expected_string
   end
 
   def assert_cycle_sequence_excluding *args
     args.each do |unexpected_string|
-      check_file_content(CYCLE_LOG_FILE, unexpected_string, false)
+      expect(File.read(CYCLE_LOG_FILE)).not_to match unexpected_string
     end
   end
 
   def assert_complete_cycle_sequence *args
     expected_string = "#{CYCLE_SEQUENCE_SEPARATOR}#{args.join(CYCLE_SEQUENCE_SEPARATOR)}"
-    check_exact_file_content(CYCLE_LOG_FILE, expected_string)
+    expect(File.read(CYCLE_LOG_FILE)).to match expected_string
   end
 
   def assert_data_table_equals_json(json)
-    prep_for_fs_check do
-      log_file_contents = IO.read(DATA_TABLE_LOG_FILE)
-      actual_array      = JSON.parse(log_file_contents)
-      expected_array    = JSON.parse(json)
-      actual_array.should == expected_array
-    end
+    log_file_contents = File.read(DATA_TABLE_LOG_FILE)
+    actual_array      = JSON.parse(log_file_contents)
+    expected_array    = JSON.parse(json)
+    expect(actual_array).to be == expected_array
   end
 
   def run_feature
@@ -302,7 +300,7 @@ def write_main_step_definitions_file
 
   def compile_step_definitions
     compiler_output = %x[ #{COMPILE_STEP_DEFINITIONS_CMD} ]
-    expect($?.success?).to be_true, "Compilation failed!\n#{compiler_output}"
+    expect($?.success?).to be == true, "Compilation failed!\n#{compiler_output}"
   end
 
   def create_wire_file
diff --git a/travis.sh b/travis.sh
index 0208a6b8..b7663aec 100755
--- a/travis.sh
+++ b/travis.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 set -e #break script on non-zero exitcode from any command
+gem install gem-shut-the-fuck-up
 gem install bundler
 cmake -E make_directory build
 cmake -E chdir build cmake -DCUKE_ENABLE_EXAMPLES=on -DGTEST_INCLUDE_DIR=/usr/src/gmock/gtest/include/  ..