diff --git a/.travis.yml b/.travis.yml
index 0257dc10..dca5dd32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ rvm:
   
 script: "bundle exec rake test"
 
-env: TRAVIS=true
+env: TEST=true
 
 matrix:
   allow_failures:
diff --git a/gem_rake_helper.rb b/gem_rake_helper.rb
index 2ff1b22c..d61602cc 100644
--- a/gem_rake_helper.rb
+++ b/gem_rake_helper.rb
@@ -17,6 +17,8 @@ class Bundler::GemHelper
 end
 
 Cucumber::Rake::Task.new(:test, 'Run features that should pass') do |t|
+  ENV["TEST"] = "true"
+  
   exempt_tags = ""
   exempt_tags << "--tags ~@nojava" if RUBY_PLATFORM == "java"
   
diff --git a/middleman-core/lib/middleman-core/templates.rb b/middleman-core/lib/middleman-core/templates.rb
index dae2c9a8..8a63e80b 100644
--- a/middleman-core/lib/middleman-core/templates.rb
+++ b/middleman-core/lib/middleman-core/templates.rb
@@ -57,7 +57,7 @@ module Middleman::Templates
       
       inside(location) do
         ::Middleman::Cli::Bundle.new.invoke(:bundle)
-      end unless ENV["TRAVIS"]
+      end unless ENV["TEST"]
     end
 
     # Output a .gitignore file