diff --git a/.travis.yml b/.travis.yml
index 03b75140..57910ca7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ rvm:
   - rbx-19mode
   
 script: "bundle exec rake test"
-  
+
 branches:
   only:
     - master
diff --git a/gem_rake_helper.rb b/gem_rake_helper.rb
index 5cb71c65..2ff1b22c 100644
--- a/gem_rake_helper.rb
+++ b/gem_rake_helper.rb
@@ -17,7 +17,10 @@ class Bundler::GemHelper
 end
 
 Cucumber::Rake::Task.new(:test, 'Run features that should pass') do |t|
-  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
+  exempt_tags = ""
+  exempt_tags << "--tags ~@nojava" if RUBY_PLATFORM == "java"
+  
+  t.cucumber_opts = "--color --tags ~@wip #{exempt_tags} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
 end
 
 YARD::Rake::YardocTask.new
diff --git a/middleman-more/features/markdown.feature b/middleman-more/features/markdown.feature
index 9987435b..e270f23b 100644
--- a/middleman-more/features/markdown.feature
+++ b/middleman-more/features/markdown.feature
@@ -15,38 +15,4 @@ Feature: Markdown support
     When I go to "/tables.html"
     Then I should see "<table>"
     When I go to "/space_after_headers.html"
-    Then I should not see "<h1>"
-
-  Scenario: Redcarpet 2 extensions
-    Given a fixture app "markdown-app"
-    And a file named "config.rb" with:
-      """
-      set :markdown_engine, :redcarpet
-      set :markdown, :no_intra_emphasis => true,
-                     :tables => true,
-                     :fenced_code_blocks => true,
-                     :autolink => true,
-                     :strikethrough => true,
-                     :lax_html_blocks => true,
-                     :space_after_headers => true,
-                     :superscript => true#, :smartypants => true
-                     
-      """
-    Given the Server is running at "markdown-app"
-    # When I go to "/smarty_pants.html"
-    # Then I should see "&#8220;"
-    When I go to "/no_intra_emphasis.html"
-    Then I should not see "<em>"
-    When I go to "/tables.html"
-    Then I should see "<table>"
-    When I go to "/fenced_code_blocks.html"
-    Then I should see "<code>"
-    When I go to "/autolink.html"
-    Then I should see "<a href"
-    When I go to "/strikethrough.html"
-    Then I should see "<del>"
-    When I go to "/space_after_headers.html"
-    Then I should not see "<h1>"
-    When I go to "/superscript.html"
-    Then I should see "<sup>"
-    
\ No newline at end of file
+    Then I should not see "<h1>"
\ No newline at end of file
diff --git a/middleman-more/features/markdown_redcarpet.feature b/middleman-more/features/markdown_redcarpet.feature
new file mode 100644
index 00000000..0749f69f
--- /dev/null
+++ b/middleman-more/features/markdown_redcarpet.feature
@@ -0,0 +1,37 @@
+@nojava
+Feature: Markdown support
+  In order to test included Maruku support
+
+  Scenario: Redcarpet 2 extensions
+    Given a fixture app "markdown-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      set :markdown, :no_intra_emphasis => true,
+                     :tables => true,
+                     :fenced_code_blocks => true,
+                     :autolink => true,
+                     :strikethrough => true,
+                     :lax_html_blocks => true,
+                     :space_after_headers => true,
+                     :superscript => true#, :smartypants => true
+                     
+      """
+    Given the Server is running at "markdown-app"
+    # When I go to "/smarty_pants.html"
+    # Then I should see "&#8220;"
+    When I go to "/no_intra_emphasis.html"
+    Then I should not see "<em>"
+    When I go to "/tables.html"
+    Then I should see "<table>"
+    When I go to "/fenced_code_blocks.html"
+    Then I should see "<code>"
+    When I go to "/autolink.html"
+    Then I should see "<a href"
+    When I go to "/strikethrough.html"
+    Then I should see "<del>"
+    When I go to "/space_after_headers.html"
+    Then I should not see "<h1>"
+    When I go to "/superscript.html"
+    Then I should see "<sup>"
+    
\ No newline at end of file