diff --git a/Gemfile b/Gemfile
index 28cc9224..24ba43b2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,6 @@ gem 'yard', '~> 0.8', require: false
 gem 'pry', '~> 0.10', group: :development
 gem 'aruba', '~> 0.7.4'
 gem 'rspec', '~> 3.0'
-gem 'fivemat', '~> 1.3'
 gem 'cucumber', '~> 2.0'
 
 # Optional middleman dependencies, included for tests
diff --git a/gem_rake_helper.rb b/gem_rake_helper.rb
index a90ea7dc..ff7a592d 100644
--- a/gem_rake_helper.rb
+++ b/gem_rake_helper.rb
@@ -21,7 +21,7 @@ Cucumber::Rake::Task.new do |t|
   exempt_tags << '--tags ~@encoding' unless Object.const_defined?(:Encoding)
   exempt_tags << '--tags ~@nowindows' if Gem.win_platform?
   exempt_tags << '--tags ~@travishatesme' if ENV['TRAVIS'] == 'true'
-  t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
+  t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict"# --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
 end
 
 Cucumber::Rake::Task.new(:cucumber_wip) do |t|
@@ -29,7 +29,7 @@ Cucumber::Rake::Task.new(:cucumber_wip) do |t|
   exempt_tags << '--tags ~@nojava' if RUBY_PLATFORM == 'java'
   exempt_tags << '--tags ~@encoding' unless Object.const_defined?(:Encoding)
   exempt_tags << '--tags ~@nowindows' if Gem.win_platform?
-  t.cucumber_opts = "--color #{exempt_tags.join(' ')} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
+  t.cucumber_opts = "--color #{exempt_tags.join(' ')} --strict"# --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
 end
 
 require 'rspec/core/rake_task'
diff --git a/middleman-core/lib/middleman-core/templates/extension/Gemfile b/middleman-core/lib/middleman-core/templates/extension/Gemfile
index 81495fe1..b52f3729 100644
--- a/middleman-core/lib/middleman-core/templates/extension/Gemfile
+++ b/middleman-core/lib/middleman-core/templates/extension/Gemfile
@@ -13,7 +13,6 @@ end
 
 group :test do
   gem 'cucumber'
-  gem 'fivemat'
   gem 'aruba'
   gem 'rspec'
 end
diff --git a/middleman-core/lib/middleman-core/templates/extension/Rakefile b/middleman-core/lib/middleman-core/templates/extension/Rakefile
index 7910cf22..529dfacf 100644
--- a/middleman-core/lib/middleman-core/templates/extension/Rakefile
+++ b/middleman-core/lib/middleman-core/templates/extension/Rakefile
@@ -4,7 +4,7 @@ Bundler::GemHelper.install_tasks
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
+  t.cucumber_opts = "--color --tags ~@wip --strict"
 end
 
 require 'rake/clean'