6 files changed, 13 insertions, 10 deletions
diff --git a/spec/integration/parser/ruby_manifest_spec.rb b/spec/integration/parser/ruby_manifest_spec.rb
index b04baf5e0..7f3bb71e9 100755
--- a/spec/integration/parser/ruby_manifest_spec.rb
+++ b/spec/integration/parser/ruby_manifest_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'tempfile'
 require 'puppet_spec/files'
 
-describe "Pure ruby manifests", :fails_on_windows => true do
+describe "Pure ruby manifests" do
   include PuppetSpec::Files
 
   before do
diff --git a/spec/integration/resource/type_collection_spec.rb b/spec/integration/resource/type_collection_spec.rb
index 0852a9850..6ea2e7fe7 100755
--- a/spec/integration/resource/type_collection_spec.rb
+++ b/spec/integration/resource/type_collection_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'puppet_spec/files'
 require 'puppet/resource/type_collection'
 
-describe Puppet::Resource::TypeCollection, :fails_on_windows => true do
+describe Puppet::Resource::TypeCollection do
   describe "when autoloading from modules" do
     include PuppetSpec::Files
 
diff --git a/spec/unit/indirector/file_bucket_file/file_spec.rb b/spec/unit/indirector/file_bucket_file/file_spec.rb
index ee0b61af1..eb86eee85 100755
--- a/spec/unit/indirector/file_bucket_file/file_spec.rb
+++ b/spec/unit/indirector/file_bucket_file/file_spec.rb
@@ -14,7 +14,7 @@ describe Puppet::FileBucketFile::File do
     Puppet::FileBucketFile::File.doc.should be_instance_of(String)
   end
 
-  describe "non-stubbing tests", :fails_on_windows => true do
+  describe "non-stubbing tests" do
     include PuppetSpec::Files
 
     before do
diff --git a/spec/unit/type/file_spec.rb b/spec/unit/type/file_spec.rb
index f416e987a..6be8acfca 100755
--- a/spec/unit/type/file_spec.rb
+++ b/spec/unit/type/file_spec.rb
@@ -305,9 +305,8 @@ describe Puppet::Type.type(:file) do
         file[:path].should == "X:/"
       end
 
-      it "should add a slash to a drive letter", :'fails_on_windows' => true, :'fails_on_ruby_1.9.2' => true do
-        file = Puppet::Type::File.new(:path => "X:")
-        file[:path].should == "X:/"
+      it "should not accept a drive letter without a slash", :'fails_on_ruby_1.9.2' => true do
+        lambda { Puppet::Type::File.new(:path => "X:") }.should raise_error(/File paths must be fully qualified/)
       end
     end
 
diff --git a/spec/unit/type/ssh_authorized_key_spec.rb b/spec/unit/type/ssh_authorized_key_spec.rb
index 9b3760b71..41413763c 100755
--- a/spec/unit/type/ssh_authorized_key_spec.rb
+++ b/spec/unit/type/ssh_authorized_key_spec.rb
@@ -228,7 +228,7 @@ describe ssh_authorized_key do
   end
 
 
-  describe "when user is specified", :fails_on_windows => true do
+  describe "when user is specified", :unless => Puppet.features.microsoft_windows? do
 
     it "should determine target" do
       resource = @class.create(
diff --git a/spec/unit/util/run_mode_spec.rb b/spec/unit/util/run_mode_spec.rb
index 883ee1206..5d9a3d058 100755
--- a/spec/unit/util/run_mode_spec.rb
+++ b/spec/unit/util/run_mode_spec.rb
@@ -1,14 +1,16 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
-describe Puppet::Util::RunMode, :fails_on_windows => true do
+describe Puppet::Util::RunMode do
   before do
     @run_mode = Puppet::Util::RunMode.new('fake')
   end
 
   it "should have confdir /etc/puppet when run as root" do
     Puppet.features.stubs(:root?).returns(true)
-    @run_mode.conf_dir.should == '/etc/puppet'
+    etcdir = Puppet.features.microsoft_windows? ? File.join(Dir::WINDOWS, "puppet", "etc") : '/etc/puppet'
+    # REMIND: issue with windows backslashes
+    @run_mode.conf_dir.should == File.expand_path(etcdir)
   end
 
   it "should have confdir ~/.puppet when run as non-root" do
@@ -19,7 +21,9 @@ describe Puppet::Util::RunMode, :fails_on_windows => true do
 
   it "should have vardir /var/lib/puppet when run as root" do
     Puppet.features.stubs(:root?).returns(true)
-    @run_mode.var_dir.should == '/var/lib/puppet'
+    vardir = Puppet.features.microsoft_windows? ? File.join(Dir::WINDOWS, "puppet", "var") : '/var/lib/puppet'
+    # REMIND: issue with windows backslashes
+    @run_mode.var_dir.should == File.expand_path(vardir)
   end
 
   it "should have vardir ~/.puppet/var when run as non-root" do