3 files changed, 12 insertions, 3 deletions
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
@@ -65,4 +65,4 @@ class Puppet::Provider::NetworkDevice < Puppet::Provider
   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
@@ -9,4 +9,9 @@ class Puppet::Util::NetworkDevice
   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
@@ -10,6 +10,10 @@ describe Puppet::Util::NetworkDevice 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)
@@ -43,4 +47,4 @@ describe Puppet::Util::NetworkDevice do
       Puppet::Util::NetworkDevice.current.should == device
     end
   end
-end
-\ No newline at end of file
+end