3 files changed, 20 insertions, 2 deletions
diff --git a/test/syck/test_struct.rb b/test/syck/test_struct.rb
index cdd4814fd4..547c5f2d71 100644
--- a/test/syck/test_struct.rb
+++ b/test/syck/test_struct.rb
@@ -11,6 +11,15 @@ end
 
 module Syck
   class TestStruct < MiniTest::Unit::TestCase
+    def setup
+        @current_engine = YAML::ENGINE.yamler
+        YAML::ENGINE.yamler = 'syck'
+    end
+
+    def teardown
+        YAML::ENGINE.yamler = @current_engine
+    end
+
     def test_roundtrip
       thing = StructWithIvar.new('bar')
       struct = YAML.load(YAML.dump(thing))
@@ -24,7 +33,7 @@ module Syck
 --- !ruby/struct:StructWithIvar 
 foo: bar
 @bar: hello
-      eoyml
+eoyml
 
       assert_equal 'hello', obj.bar
       assert_equal 'bar', obj.foo
diff --git a/test/syck/test_yaml.rb b/test/syck/test_yaml.rb
index ece1b768e3..1a78e9d216 100644
--- a/test/syck/test_yaml.rb
+++ b/test/syck/test_yaml.rb
@@ -13,6 +13,15 @@ end
 
 module Syck
 class YAML_Unit_Tests < Test::Unit::TestCase
+    def setup
+        @current_engine = YAML::ENGINE.yamler
+        YAML::ENGINE.yamler = 'syck'
+    end
+
+    def teardown
+        YAML::ENGINE.yamler = @current_engine
+    end
+
 	#
 	# Convert between YAML and the object to verify correct parsing and
 	# emitting
diff --git a/test/syck/test_yamlstore.rb b/test/syck/test_yamlstore.rb
index 971c75bf27..c94a745ac1 100644
--- a/test/syck/test_yamlstore.rb
+++ b/test/syck/test_yamlstore.rb
@@ -1,9 +1,9 @@
 require 'test/unit'
-require 'yaml/store'
 
 module Syck
   class YAMLStoreTest < Test::Unit::TestCase
     def setup
+      require 'yaml/store'
       @yamlstore_file = "yamlstore.tmp.#{Process.pid}"
       @yamlstore = YAML::Store.new(@yamlstore_file)
     end