diff --git a/Gemfile b/Gemfile
index 8c1b1b9a..af18b2a0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,6 +8,6 @@ else
 end
 
 gem 'gollum-lib', :git => 'https://github.com/gollum/gollum-lib.git', :branch => 'gollum-lib-5.x' # For development purposes
-
+gem 'therubyrhino', :platforms => :jruby
 gemspec
 gem 'rake', '~> 11.2'
diff --git a/gollum.gemspec b/gollum.gemspec
index 49c46212..7b26862c 100644
--- a/gollum.gemspec
+++ b/gollum.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sinatra-contrib', '~> 2.0'
   s.add_dependency 'mustache', ['>= 0.99.5', '< 1.0.0']
   s.add_dependency 'useragent', '~> 0.16.2'
-  s.add_dependency 'gemojione', '~> 3.2'
+  s.add_dependency 'gemojione', '~> 4.1'
   s.add_dependency 'octicons', '~> 8.5'
   s.add_dependency 'sprockets', '~> 3.7'
   s.add_dependency 'sass', '~> 3.5'
diff --git a/test/helper.rb b/test/helper.rb
index 556faac4..85e4ce0c 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -40,15 +40,15 @@ def testpath(path)
   File.join(TEST_DIR, path)
 end
 
-def cloned_testpath(path)
+def cloned_testpath(path, bare = false)
   repo   = File.expand_path(testpath(path))
-  path   = File.dirname(repo)
-  cloned = File.join(path, self.class.name)
-  FileUtils.rm_rf(cloned)
-  Dir.chdir(path) do
-    %x{git clone #{File.basename(repo)} #{self.class.name} 2>/dev/null}
-  end
-  cloned
+  tmp    = Tempfile.new(self.class.name)
+  path   = tmp.path
+  bare   = bare ? "--bare" : ""
+  tmp.close(true)
+  redirect = Gem.win_platform? ? '' : '2>/dev/null'
+  %x{git clone #{bare} #{repo} #{path} #{redirect}}
+  path
 end
 
 def commit_details
diff --git a/test/test_allow_editing.rb b/test/test_allow_editing.rb
index 63835371..8ce2394d 100644
--- a/test/test_allow_editing.rb
+++ b/test/test_allow_editing.rb
@@ -4,15 +4,13 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 context "Precious::Views::Editing" do
   include Rack::Test::Methods
   setup do
-    examples = testpath "examples"
-    @path    = File.join(examples, "test.git")
+    @path    = cloned_testpath('examples/revert.git')
     Precious::App.set(:gollum_path, @path)
-    FileUtils.cp_r File.join(examples, "revert.git"), @path, :remove_destination => true
     @wiki = Gollum::Wiki.new(@path)
   end
 
   teardown do
-    FileUtils.rm_r(File.join(File.dirname(__FILE__), *%w[examples test.git]))
+    FileUtils.rm_rf(@path)
   end
 
   test "creating page is blocked" do
diff --git a/test/test_page_view.rb b/test/test_page_view.rb
index f8d16f92..c8227add 100644
--- a/test/test_page_view.rb
+++ b/test/test_page_view.rb
@@ -5,14 +5,12 @@ require File.expand_path '../../lib/gollum/views/page', __FILE__
 
 context "Precious::Views::Page" do
   setup do
-    examples = testpath "examples"
-    @path    = File.join(examples, "test.git")
-    FileUtils.cp_r File.join(examples, "empty.git"), @path, :remove_destination => true
+    @path    = cloned_testpath('examples/empty.git')
     @wiki = Gollum::Wiki.new(@path)
   end
 
   teardown do
-    FileUtils.rm_r(File.join(File.dirname(__FILE__), *%w[examples test.git]))
+    FileUtils.rm_rf(@path)
   end
 
   test "h1 title sanitizes correctly" do