diff --git a/spec/unit/indirector/facts/facter.rb b/spec/unit/indirector/facts/facter.rb
index 1fad4c859..0974a60ec 100755
--- a/spec/unit/indirector/facts/facter.rb
+++ b/spec/unit/indirector/facts/facter.rb
@@ -1,79 +1,76 @@
 #!/usr/bin/env ruby
 #
 #  Created by Luke Kanies on 2007-9-23.
 #  Copyright (c) 2007. All rights reserved.
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 require 'puppet/indirector/facts/facter'
 
 describe Puppet::Node::Facts::Facter do
     it "should be a subclass of the Code terminus" do
         Puppet::Node::Facts::Facter.superclass.should equal(Puppet::Indirector::Code)
     end
 
     it "should have documentation" do
         Puppet::Node::Facts::Facter.doc.should_not be_nil
     end
 
     it "should be registered with the configuration store indirection" do
         indirection = Puppet::Indirector::Indirection.instance(:facts)
         Puppet::Node::Facts::Facter.indirection.should equal(indirection)
     end
 
     it "should have its name set to :facter" do
         Puppet::Node::Facts::Facter.name.should == :facter
     end
 
     it "should load facts on initialization" do
         Puppet::Node::Facts::Facter.expects(:loadfacts)
         Puppet::Node::Facts::Facter.new
     end
 end
 
-module TestingCodeFacts
-    def setup
+describe Puppet::Node::Facts::Facter do
+    before :each do
         @facter = Puppet::Node::Facts::Facter.new
         Facter.stubs(:to_hash).returns({})
         @name = "me"
         @facts = @facter.find(@name)
     end
-end
 
-describe Puppet::Node::Facts::Facter, " when finding facts" do
-    include TestingCodeFacts
+    describe Puppet::Node::Facts::Facter, " when finding facts" do
 
-    it "should return a Facts instance" do
-        @facts.should be_instance_of(Puppet::Node::Facts)
-    end
+        it "should return a Facts instance" do
+            @facts.should be_instance_of(Puppet::Node::Facts)
+        end
 
-    it "should return a Facts instance with the provided key as the name" do
-        @facts.name.should == @name
-    end
+        it "should return a Facts instance with the provided key as the name" do
+            @facts.name.should == @name
+        end
 
-    it "should return the Facter facts as the values in the Facts instance" do
-        Facter.expects(:to_hash).returns("one" => "two")
-        facts = @facter.find(@name)
-        facts.values["one"].should == "two"
+        it "should return the Facter facts as the values in the Facts instance" do
+            Facter.expects(:to_hash).returns("one" => "two")
+            facts = @facter.find(@name)
+            facts.values["one"].should == "two"
+        end
     end
-end
 
-describe Puppet::Node::Facts::Facter, " when saving facts" do
-    include TestingCodeFacts
+    describe Puppet::Node::Facts::Facter, " when saving facts" do
 
-    it "should fail" do
-        proc { @facter.save(@facts) }.should raise_error(Puppet::DevError)
+        it "should fail" do
+            proc { @facter.save(@facts) }.should raise_error(Puppet::DevError)
+        end
     end
-end
 
-describe Puppet::Node::Facts::Facter, " when destroying facts" do
-    include TestingCodeFacts
+    describe Puppet::Node::Facts::Facter, " when destroying facts" do
 
-    it "should fail" do
-        proc { @facter.destroy(@facts) }.should raise_error(Puppet::DevError)
+        it "should fail" do
+            proc { @facter.destroy(@facts) }.should raise_error(Puppet::DevError)
+        end
     end
-end
 
-describe Puppet::Node::Facts::Facter, " when loading facts from the factpath" do
-    it "should load every fact in each factpath directory"
-end
+    describe Puppet::Node::Facts::Facter, " when loading facts from the factpath" do
+        it "should load every fact in each factpath directory"
+    end
+end
\ No newline at end of file