--- a/src/internet/test/ipv4-address-helper-test-suite.cc	Thu May 24 04:16:20 2012 -0400
+++ b/src/internet/test/ipv4-address-helper-test-suite.cc	Thu May 24 20:57:51 2012 -0700
@@ -187,6 +187,7 @@
 
 private:
   virtual void DoRun (void);
+  virtual void DoTeardown (void);
 };
 
 IpAddressHelperTestCasev4::IpAddressHelperTestCasev4 ()
@@ -246,6 +247,13 @@
 
 }
 
+void
+IpAddressHelperTestCasev4::DoTeardown (void)
+{
+  Ipv4AddressGenerator::Reset ();
+  Simulator::Destroy ();
+}
+
 
 static class Ipv4AddressHelperTestSuite : public TestSuite
 {