package com.yammer.tenacity.testing;

import com.netflix.config.ConfigurationManager;
import com.netflix.hystrix.Hystrix;
import com.netflix.hystrix.contrib.yammermetricspublisher.HystrixYammerMetricsPublisher;
import com.netflix.hystrix.strategy.HystrixPlugins;
import org.junit.After;
import org.junit.Before;

import java.util.concurrent.TimeUnit;

public abstract class TenacityTest {
    static {
        HystrixPlugins.getInstance().registerMetricsPublisher(new HystrixYammerMetricsPublisher());
    }

    @Before
    public void testInitialization() {
        ConfigurationManager
                .getConfigInstance()
                .setProperty("hystrix.command.default.metrics.healthSnapshot.intervalInMilliseconds", "1");
    }

    @After
    public void testTeardown() {
        Hystrix.reset(1, TimeUnit.SECONDS);
        ConfigurationManager.getConfigInstance().clear();
    }
}
package com.yammer.tenacity.testing;

import com.netflix.config.ConfigurationManager;
import com.netflix.hystrix.Hystrix;
import com.netflix.hystrix.contrib.yammermetricspublisher.HystrixYammerMetricsPublisher;
import com.netflix.hystrix.strategy.HystrixPlugins;
import org.junit.After;

import java.util.concurrent.TimeUnit;

public abstract class TenacityTest {
    static {
        initialization();
    }

    private static void initialization() {
        HystrixPlugins.getInstance().registerMetricsPublisher(new HystrixYammerMetricsPublisher());
        ConfigurationManager
                .getConfigInstance()
                .setProperty("hystrix.command.default.metrics.healthSnapshot.intervalInMilliseconds", "1");
    }

    @After
    public void testTeardown() {
        Hystrix.reset(1, TimeUnit.SECONDS);
    }
}
--- 
+++ 
@@ -5,16 +5,17 @@
 import com.netflix.hystrix.contrib.yammermetricspublisher.HystrixYammerMetricsPublisher;
 import com.netflix.hystrix.strategy.HystrixPlugins;
 import org.junit.After;
+import org.junit.Before;
 
 import java.util.concurrent.TimeUnit;
 
 public abstract class TenacityTest {
     static {
-        initialization();
+        HystrixPlugins.getInstance().registerMetricsPublisher(new HystrixYammerMetricsPublisher());
     }
 
-    private static void initialization() {
-        HystrixPlugins.getInstance().registerMetricsPublisher(new HystrixYammerMetricsPublisher());
+    @Before
+    public void testInitialization() {
         ConfigurationManager
                 .getConfigInstance()
                 .setProperty("hystrix.command.default.metrics.healthSnapshot.intervalInMilliseconds", "1");
@@ -23,5 +24,6 @@
     @After
     public void testTeardown() {
         Hystrix.reset(1, TimeUnit.SECONDS);
+        ConfigurationManager.getConfigInstance().clear();
     }
 }
Reset the ConfigurationManager when testing Tenacity
