diff --git a/spec/integration/type/nagios_spec.rb b/spec/integration/type/nagios_spec.rb
index 818b61649..6a1008880 100644
--- a/spec/integration/type/nagios_spec.rb
+++ b/spec/integration/type/nagios_spec.rb
@@ -1,80 +1,72 @@
 #!/usr/bin/env ruby
 
 require 'spec_helper'
 require 'puppet/file_bucket/dipper'
 
 describe "Nagios file creation" do
   include PuppetSpec::Files
 
   before :each do
     FileUtils.touch(target_file)
     File.chmod(0600, target_file)
     Puppet::FileBucket::Dipper.any_instance.stubs(:backup) # Don't backup to filebucket
   end
 
   let :target_file do
     tmpfile('nagios_integration_specs')
   end
 
   # Copied from the crontab integration spec.
   #
   # @todo This should probably live in the PuppetSpec module instead then.
   def run_in_catalog(*resources)
     catalog = Puppet::Resource::Catalog.new
     catalog.host_config = false
     resources.each do |resource|
       resource.expects(:err).never
       catalog.add_resource(resource)
     end
 
     # the resources are not properly contained and generated resources
     # will end up with dangling edges without this stubbing:
     catalog.stubs(:container_of).returns resources[0]
     catalog.apply
   end
 
-  # These three helpers are from file_spec.rb
-  #
-  # @todo Define those centrally as well?
-  def get_mode(file)
-    Puppet::FileSystem.stat(file).mode
-  end
-
   context "when creating a nagios config file" do
     context "which is not managed" do
       it "should choose the file mode if requested" do
         resource = Puppet::Type.type(:nagios_host).new(
           :name   => 'spechost',
           :use    => 'spectemplate',
           :ensure => 'present',
           :target => target_file,
           :mode   => '0640'
         )
         run_in_catalog(resource)
         # sticky bit only applies to directories in Windows
-        mode = Puppet.features.microsoft_windows? ? "640" : "100640"
-        ( "%o" % get_mode(target_file) ).should == mode
+        expect_file_mode(target_file, "640")
       end
     end
 
     context "which is managed" do
-      it "should not the mode" do
+      it "should not override the mode" do
         file_res = Puppet::Type.type(:file).new(
           :name   => target_file,
           :ensure => :present
         )
         nag_res = Puppet::Type.type(:nagios_host).new(
           :name   => 'spechost',
           :use    => 'spectemplate',
           :ensure => :present,
           :target => target_file,
           :mode   => '0640'
         )
         run_in_catalog(file_res, nag_res)
-        ( "%o" % get_mode(target_file) ).should_not == "100640"
+        expect_file_mode(target_file, "600")
       end
     end
 
   end
 
 end
diff --git a/spec/lib/puppet_spec/files.rb b/spec/lib/puppet_spec/files.rb
index 1e1076b91..312c4fc95 100755
--- a/spec/lib/puppet_spec/files.rb
+++ b/spec/lib/puppet_spec/files.rb
@@ -1,78 +1,88 @@
 require 'fileutils'
 require 'tempfile'
 require 'tmpdir'
 require 'pathname'
 
 # A support module for testing files.
 module PuppetSpec::Files
   def self.cleanup
     $global_tempfiles ||= []
     while path = $global_tempfiles.pop do
       begin
         Dir.unstub(:entries)
         FileUtils.rm_rf path, :secure => true
       rescue Errno::ENOENT
         # nothing to do
       end
     end
   end
 
   def make_absolute(path) PuppetSpec::Files.make_absolute(path) end
   def self.make_absolute(path)
     path = File.expand_path(path)
     path[0] = 'c' if Puppet.features.microsoft_windows?
     path
   end
 
   def tmpfile(name, dir = nil) PuppetSpec::Files.tmpfile(name, dir) end
   def self.tmpfile(name, dir = nil)
     # Generate a temporary file, just for the name...
     source = dir ? Tempfile.new(name, dir) : Tempfile.new(name)
     path = source.path
     source.close!
 
     record_tmp(File.expand_path(path))
 
     path
   end
 
   def file_containing(name, contents) PuppetSpec::Files.file_containing(name, contents) end
   def self.file_containing(name, contents)
     file = tmpfile(name)
     File.open(file, 'wb') { |f| f.write(contents) }
     file
   end
 
   def tmpdir(name) PuppetSpec::Files.tmpdir(name) end
   def self.tmpdir(name)
     dir = Dir.mktmpdir(name)
 
     record_tmp(dir)
 
     dir
   end
 
   def dir_containing(name, contents_hash) PuppetSpec::Files.dir_containing(name, contents_hash) end
   def self.dir_containing(name, contents_hash)
     dir_contained_in(tmpdir(name), contents_hash)
   end
 
   def self.dir_contained_in(dir, contents_hash)
     contents_hash.each do |k,v|
       if v.is_a?(Hash)
         Dir.mkdir(tmp = File.join(dir,k))
         dir_contained_in(tmp, v)
       else
         file = File.join(dir, k)
         File.open(file, 'wb') {|f| f.write(v) }
       end
     end
     dir
   end
 
   def self.record_tmp(tmp)
     # ...record it for cleanup,
     $global_tempfiles ||= []
     $global_tempfiles << tmp
   end
+
+  def expect_file_mode(file, mode)
+    actual_mode = "%o" % Puppet::FileSystem.stat(file).mode
+    target_mode = if Puppet.features.microsoft_windows?
+      mode
+    else
+      "10" + "%04i" % mode.to_i
+    end
+    actual_mode.should == target_mode
+  end
 end