diff --git a/lib/puppet/provider/network_device.rb b/lib/puppet/provider/network_device.rb
index b178df977..46be27968 100644
--- a/lib/puppet/provider/network_device.rb
+++ b/lib/puppet/provider/network_device.rb
@@ -1,68 +1,68 @@
 
 # This is the base class of all prefetched network device provider
 class Puppet::Provider::NetworkDevice < Puppet::Provider
 
   def self.device(url)
     raise "This provider doesn't implement the necessary device method"
   end
 
   def self.lookup(device, name)
     raise "This provider doesn't implement the necessary lookup method"
   end
 
   def self.prefetch(resources)
     resources.each do |name, resource|
       device = Puppet::Util::NetworkDevice.current || device(resource[:device_url])
       if result = lookup(device, name)
         result[:ensure] = :present
         resource.provider = new(device, result)
       else
         resource.provider = new(device, :ensure => :absent)
       end
     end
   end
 
   def exists?
     @property_hash[:ensure] != :absent
   end
 
   attr_accessor :device
 
   def initialize(device, *args)
     super(*args)
 
     @device = device
 
     # Make a duplicate, so that we have a copy for comparison
     # at the end.
     @properties = @property_hash.dup
   end
 
   def create
     @property_hash[:ensure] = :present
     self.class.resource_type.validproperties.each do |property|
       if val = resource.should(property)
         @property_hash[property] = val
       end
     end
   end
 
   def destroy
     @property_hash[:ensure] = :absent
   end
 
   def flush
     @property_hash.clear
   end
 
   def self.instances
   end
 
   def former_properties
     @properties.dup
   end
 
   def properties
     @property_hash.dup
   end
-end
\ No newline at end of file
+end
diff --git a/lib/puppet/util/network_device.rb b/lib/puppet/util/network_device.rb
index d9c1aa34d..7fb8e2ff3 100644
--- a/lib/puppet/util/network_device.rb
+++ b/lib/puppet/util/network_device.rb
@@ -1,12 +1,17 @@
 class Puppet::Util::NetworkDevice
   class << self
     attr_reader :current
   end
 
   def self.init(device)
     require "puppet/util/network_device/#{device.provider}/device"
     @current = Puppet::Util::NetworkDevice.const_get(device.provider.capitalize).const_get(:Device).new(device.url)
   rescue => detail
     raise "Can't load #{device.provider} for #{device.name}: #{detail}"
   end
-end
\ No newline at end of file
+
+  # Should only be used in tests
+  def self.teardown
+    @current = nil
+  end
+end
diff --git a/spec/unit/util/network_device_spec.rb b/spec/unit/util/network_device_spec.rb
index 70cb509b4..0f7c6036b 100644
--- a/spec/unit/util/network_device_spec.rb
+++ b/spec/unit/util/network_device_spec.rb
@@ -1,46 +1,50 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
 require 'ostruct'
 require 'puppet/util/network_device'
 
 describe Puppet::Util::NetworkDevice do
 
   before(:each) do
     @device = OpenStruct.new(:name => "name", :provider => "test")
   end
 
+  after(:each) do
+    Puppet::Util::NetworkDevice.teardown
+  end
+
   class Puppet::Util::NetworkDevice::Test
     class Device
       def initialize(device)
       end
     end
   end
 
   describe "when initializing the remote network device singleton" do
     it "should load the network device code" do
       Puppet::Util::NetworkDevice.expects(:require)
       Puppet::Util::NetworkDevice.init(@device)
     end
 
     it "should create a network device instance" do
       Puppet::Util::NetworkDevice.stubs(:require)
       Puppet::Util::NetworkDevice::Test::Device.expects(:new)
       Puppet::Util::NetworkDevice.init(@device)
     end
 
     it "should raise an error if the remote device instance can't be created" do
       Puppet::Util::NetworkDevice.stubs(:require).raises("error")
       lambda { Puppet::Util::NetworkDevice.init(@device) }.should raise_error
     end
 
     it "should let caller to access the singleton device" do
       device = stub 'device'
       Puppet::Util::NetworkDevice.stubs(:require)
       Puppet::Util::NetworkDevice::Test::Device.expects(:new).returns(device)
       Puppet::Util::NetworkDevice.init(@device)
 
       Puppet::Util::NetworkDevice.current.should == device
     end
   end
-end
\ No newline at end of file
+end