diff --git a/spec/unit/provider/package/pacman_spec.rb b/spec/unit/provider/package/pacman_spec.rb
index 643038d11..9b363d635 100755
--- a/spec/unit/provider/package/pacman_spec.rb
+++ b/spec/unit/provider/package/pacman_spec.rb
@@ -1,338 +1,336 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
 require 'stringio'
 
-provider = Puppet::Type.type(:package).provider(:pacman)
 
-describe provider do
+describe Puppet::Type.type(:package).provider(:pacman) do
   let(:no_extra_options) { { :failonfail => true, :combine => true, :custom_environment => {} } }
   let(:executor) { Puppet::Util::Execution }
   let(:resolver) { Puppet::Util }
 
+  let(:resource) { Puppet::Type.type(:package).new(:name => 'package', :provider => 'pacman') }
+  let(:provider) { described_class.new(resource) }
+
   before do
     resolver.stubs(:which).with('/usr/bin/pacman').returns('/usr/bin/pacman')
-    provider.stubs(:which).with('/usr/bin/pacman').returns('/usr/bin/pacman')
+    described_class.stubs(:which).with('/usr/bin/pacman').returns('/usr/bin/pacman')
     resolver.stubs(:which).with('/usr/bin/yaourt').returns('/usr/bin/yaourt')
-    provider.stubs(:which).with('/usr/bin/yaourt').returns('/usr/bin/yaourt')
-    @resource = Puppet::Type.type(:package).new(:name => 'package', :provider => 'pacman')
-    @provider = provider.new(@resource)
+    described_class.stubs(:which).with('/usr/bin/yaourt').returns('/usr/bin/yaourt')
   end
 
   describe "when installing" do
     before do
-      @provider.stubs(:query).returns({
+      provider.stubs(:query).returns({
         :ensure => '1.0'
       })
     end
 
     it "should call pacman to install the right package quietly" do
 
-      if @provider.yaourt?
-        args = ['/usr/bin/yaourt', '--noconfirm', '-S', @resource[:name]]
+      if provider.yaourt?
+        args = ['/usr/bin/yaourt', '--noconfirm', '-S', resource[:name]]
       else
-        args = ['/usr/bin/pacman', '--noconfirm', '--noprogressbar', '-Sy', @resource[:name]]
+        args = ['/usr/bin/pacman', '--noconfirm', '--noprogressbar', '-Sy', resource[:name]]
       end
 
       executor.
         expects(:execute).
         at_least_once.
         with(args, no_extra_options).
         returns ''
 
-      @provider.install
+      provider.install
     end
 
     it "should raise an ExecutionFailure if the installation failed" do
       executor.stubs(:execute).returns("")
-      @provider.expects(:query).returns(nil)
+      provider.expects(:query).returns(nil)
 
-      lambda { @provider.install }.should raise_exception(Puppet::ExecutionFailure)
+      lambda { provider.install }.should raise_exception(Puppet::ExecutionFailure)
     end
 
     context "when :source is specified" do
-      before :each do
-        @install = sequence("install")
-      end
+      let(:install_seq) { sequence("install") }
 
       context "recognizable by pacman" do
         %w{
           /some/package/file
           http://some.package.in/the/air
           ftp://some.package.in/the/air
         }.each do |source|
           it "should install #{source} directly" do
-            @resource[:source] = source
+            resource[:source] = source
 
             executor.expects(:execute).
               with(all_of(includes("-Sy"), includes("--noprogressbar")), no_extra_options).
-              in_sequence(@install).
+              in_sequence(install_seq).
               returns("")
 
             executor.expects(:execute).
               with(all_of(includes("-U"), includes(source)), no_extra_options).
-              in_sequence(@install).
+              in_sequence(install_seq).
               returns("")
 
-            @provider.install
+            provider.install
           end
         end
       end
 
       context "as a file:// URL" do
+        let(:actual_file_path) { "/some/package/file" }
+
         before do
-          @package_file = "file:///some/package/file"
-          @actual_file_path = "/some/package/file"
-          @resource[:source] = @package_file
+          resource[:source] = "file:///some/package/file"
         end
 
         it "should install from the path segment of the URL" do
           executor.expects(:execute).
             with(all_of(includes("-Sy"),
                         includes("--noprogressbar"),
                         includes("--noconfirm")),
                  no_extra_options).
-            in_sequence(@install).
+            in_sequence(install_seq).
             returns("")
 
           executor.expects(:execute).
-            with(all_of(includes("-U"), includes(@actual_file_path)), no_extra_options).
-            in_sequence(@install).
+            with(all_of(includes("-U"), includes(actual_file_path)), no_extra_options).
+            in_sequence(install_seq).
             returns("")
 
-          @provider.install
+          provider.install
         end
       end
 
       context "as a puppet URL" do
         before do
-          @resource[:source] = "puppet://server/whatever"
+          resource[:source] = "puppet://server/whatever"
         end
 
         it "should fail" do
-          lambda { @provider.install }.should raise_error(Puppet::Error)
+          lambda { provider.install }.should raise_error(Puppet::Error)
         end
       end
 
       context "as a malformed URL" do
         before do
-          @resource[:source] = "blah://"
+          resource[:source] = "blah://"
         end
 
         it "should fail" do
-          lambda { @provider.install }.should raise_error(Puppet::Error)
+          lambda { provider.install }.should raise_error(Puppet::Error)
         end
       end
     end
   end
 
   describe "when updating" do
     it "should call install" do
-      @provider.expects(:install).returns("install return value")
-      @provider.update.should == "install return value"
+      provider.expects(:install).returns("install return value")
+      provider.update.should == "install return value"
     end
   end
 
   describe "when uninstalling" do
     it "should call pacman to remove the right package quietly" do
       executor.
         expects(:execute).
-        with(["/usr/bin/pacman", "--noconfirm", "--noprogressbar", "-R", @resource[:name]], no_extra_options).
+        with(["/usr/bin/pacman", "--noconfirm", "--noprogressbar", "-R", resource[:name]], no_extra_options).
         returns ""
 
-      @provider.uninstall
+      provider.uninstall
     end
   end
 
   describe "when querying" do
     it "should query pacman" do
       executor.
         expects(:execute).
-        with(["/usr/bin/pacman", "-Qi", @resource[:name]], no_extra_options)
-      @provider.query
+        with(["/usr/bin/pacman", "-Qi", resource[:name]], no_extra_options)
+      provider.query
     end
 
     it "should return the version" do
       query_output = <<EOF
 Name           : package
 Version        : 1.01.3-2
 URL            : http://www.archlinux.org/pacman/
 Licenses       : GPL
 Groups         : base
 Provides       : None
 Depends On     : bash  libarchive>=2.7.1  libfetch>=2.25  pacman-mirrorlist
 Optional Deps  : fakeroot: for makepkg usage as normal user
                  curl: for rankmirrors usage
 Required By    : None
 Conflicts With : None
 Replaces       : None
 Installed Size : 2352.00 K
 Packager       : Dan McGee <dan@archlinux.org>
 Architecture   : i686
 Build Date     : Sat 22 Jan 2011 03:56:41 PM EST
 Install Date   : Thu 27 Jan 2011 06:45:49 AM EST
 Install Reason : Explicitly installed
 Install Script : Yes
 Description    : A library-based package manager with dependency support
 EOF
 
       executor.expects(:execute).returns(query_output)
-      @provider.query.should == {:ensure => "1.01.3-2"}
+      provider.query.should == {:ensure => "1.01.3-2"}
     end
 
     it "should return a nil if the package isn't found" do
       executor.expects(:execute).returns("")
-      @provider.query.should be_nil
+      provider.query.should be_nil
     end
 
     it "should return a hash indicating that the package is missing on error" do
       executor.expects(:execute).raises(Puppet::ExecutionFailure.new("ERROR!"))
-      @provider.query.should == {
+      provider.query.should == {
         :ensure => :purged,
         :status => 'missing',
-        :name => @resource[:name],
+        :name => resource[:name],
         :error => 'ok',
       }
     end
   end
 
 
 
   describe "when fetching a package list" do
     it "should retrieve installed packages" do
-      provider.expects(:execpipe).with(["/usr/bin/pacman", '-Q'])
-      provider.installedpkgs
+      described_class.expects(:execpipe).with(["/usr/bin/pacman", '-Q'])
+      described_class.installedpkgs
     end
 
     it "should retrieve installed package groups" do
-      provider.expects(:execpipe).with(["/usr/bin/pacman", '-Qg'])
-      provider.installedgroups
+      described_class.expects(:execpipe).with(["/usr/bin/pacman", '-Qg'])
+      described_class.installedgroups
     end
 
     it "should return installed packages with their versions" do
-      provider.expects(:execpipe).yields(StringIO.new("package1 1.23-4\npackage2 2.00\n"))
-      packages = provider.installedpkgs
+      described_class.expects(:execpipe).yields(StringIO.new("package1 1.23-4\npackage2 2.00\n"))
+      packages = described_class.installedpkgs
 
       packages.length.should == 2
 
       packages[0].properties.should == {
         :provider => :pacman,
         :ensure => '1.23-4',
         :name => 'package1'
       }
 
       packages[1].properties.should == {
         :provider => :pacman,
         :ensure => '2.00',
         :name => 'package2'
       }
     end
 
     it "should return installed groups with a dummy version" do
-      provider.expects(:execpipe).yields(StringIO.new("group1 pkg1\ngroup1 pkg2"))
-      groups = provider.installedgroups
+      described_class.expects(:execpipe).yields(StringIO.new("group1 pkg1\ngroup1 pkg2"))
+      groups = described_class.installedgroups
 
       groups.length.should == 1
 
       groups[0].properties.should == {
         :provider => :pacman,
         :ensure   => '1',
         :name     => 'group1'
       }
     end
 
     it "should return nil on error" do
-      provider.expects(:execpipe).twice.raises(Puppet::ExecutionFailure.new("ERROR!"))
-      provider.instances.should be_nil
+      described_class.expects(:execpipe).twice.raises(Puppet::ExecutionFailure.new("ERROR!"))
+      described_class.instances.should be_nil
     end
 
     it "should warn on invalid input" do
-      provider.expects(:execpipe).yields(StringIO.new("blah"))
-      provider.expects(:warning).with("Failed to match line blah")
-      provider.installedpkgs == []
+      described_class.expects(:execpipe).yields(StringIO.new("blah"))
+      described_class.expects(:warning).with("Failed to match line blah")
+      described_class.installedpkgs == []
     end
   end
 
   describe "when determining the latest version" do
     it "should refresh package list" do
       get_latest_version = sequence("get_latest_version")
       executor.
         expects(:execute).
         in_sequence(get_latest_version).
         with(['/usr/bin/pacman', '-Sy'], no_extra_options)
 
       executor.
         stubs(:execute).
         in_sequence(get_latest_version).
         returns("")
 
-      @provider.latest
+      provider.latest
     end
 
     it "should get query pacman for the latest version" do
       get_latest_version = sequence("get_latest_version")
       executor.
         stubs(:execute).
         in_sequence(get_latest_version)
 
       executor.
         expects(:execute).
         in_sequence(get_latest_version).
-        with(['/usr/bin/pacman', '-Sp', '--print-format', '%v', @resource[:name]], no_extra_options).
+        with(['/usr/bin/pacman', '-Sp', '--print-format', '%v', resource[:name]], no_extra_options).
         returns("")
 
-      @provider.latest
+      provider.latest
     end
 
     it "should return the version number from pacman" do
       executor.
         expects(:execute).
         at_least_once().
         returns("1.00.2-3\n")
 
-      @provider.latest.should == "1.00.2-3"
+      provider.latest.should == "1.00.2-3"
     end
   end
 
   context "#install_options" do
     it "should return nil by default" do
-      @provider.install_options.should be_nil
+      provider.install_options.should be_nil
     end
 
     it "should return install_options when set" do
-      @resource[:install_options] = ['-n']
-      @resource[:install_options].should == ['-n']
+      resource[:install_options] = ['-n']
+      resource[:install_options].should == ['-n']
     end
 
     it "should return multiple install_options when set" do
-      @resource[:install_options] = ['-L', '/opt/puppet']
-      @resource[:install_options].should == ['-L', '/opt/puppet']
+      resource[:install_options] = ['-L', '/opt/puppet']
+      resource[:install_options].should == ['-L', '/opt/puppet']
     end
 
     it 'should return install_options when set as hash' do
-      @resource[:install_options] = { '-Darch' => 'vax' }
-      @provider.install_options.should == ['-Darch=vax']
+      resource[:install_options] = { '-Darch' => 'vax' }
+      provider.install_options.should == ['-Darch=vax']
     end
   end
 
   context "#uninstall_options" do
     it "should return nil by default" do
-      @provider.uninstall_options.should be_nil
+      provider.uninstall_options.should be_nil
     end
 
     it "should return uninstall_options when set" do
-      @provider.resource[:uninstall_options] = ['-n']
-      @provider.resource[:uninstall_options].should == ['-n']
+      provider.resource[:uninstall_options] = ['-n']
+      provider.resource[:uninstall_options].should == ['-n']
     end
 
     it "should return multiple uninstall_options when set" do
-      @provider.resource[:uninstall_options] = ['-q', '-c']
-      @provider.resource[:uninstall_options].should == ['-q', '-c']
+      provider.resource[:uninstall_options] = ['-q', '-c']
+      provider.resource[:uninstall_options].should == ['-q', '-c']
     end
 
     it 'should return uninstall_options when set as hash' do
-      @provider.resource[:uninstall_options] = { '-Dbaddepend' => '1' }
-      @provider.uninstall_options.should == ['-Dbaddepend=1']
+      provider.resource[:uninstall_options] = { '-Dbaddepend' => '1' }
+      provider.uninstall_options.should == ['-Dbaddepend=1']
     end
   end
 
 end