diff --git a/src/test/java/com/rmn/qa/AutomationCapabilityMatcherTest.java b/src/test/java/com/rmn/qa/AutomationCapabilityMatcherTest.java
index 574470e..cfb7eef 100644
--- a/src/test/java/com/rmn/qa/AutomationCapabilityMatcherTest.java
+++ b/src/test/java/com/rmn/qa/AutomationCapabilityMatcherTest.java
@@ -42,7 +42,7 @@ public void testNodeNotInContext() {
         AutomationCapabilityMatcher matcher = new AutomationCapabilityMatcher();
         Map<String,Object> nodeCapability = new HashMap<String,Object>();
         nodeCapability.put(CapabilityType.BROWSER_NAME,"firefox");
-        nodeCapability.put(AutomationConstants.INSTANCE_ID,"foobar");
+        nodeCapability.put(AutomationConstants.INSTANCE_ID,"foo");
         Map<String,Object> testCapability = new HashMap<String,Object>();
         testCapability.put(CapabilityType.BROWSER_NAME,"firefox");
         AutomationDynamicNode node = new AutomationDynamicNode("uuid","id","browser","os", new Date(),10);
@@ -130,5 +130,7 @@ public void testPropertyDoesMatch() {
     @After
     public void clearSystemProperty() {
         System.clearProperty(AutomationConstants.EXTRA_CAPABILITIES_PROPERTY_NAME);
+        // Also clear out the old AutomationRunContext
+        AutomationContext.refreshContext();
     }
 }
diff --git a/src/test/java/com/rmn/qa/task/AutomationReaperTaskTest.java b/src/test/java/com/rmn/qa/task/AutomationReaperTaskTest.java
index 3da82a1..2e15e09 100644
--- a/src/test/java/com/rmn/qa/task/AutomationReaperTaskTest.java
+++ b/src/test/java/com/rmn/qa/task/AutomationReaperTaskTest.java
@@ -4,6 +4,7 @@
 import java.util.Calendar;
 import java.util.Date;
 
+import org.junit.After;
 import org.junit.Test;
 
 import com.amazonaws.services.ec2.model.Instance;
@@ -18,13 +19,18 @@
 
 public class AutomationReaperTaskTest {
 
+	@After
+    public void tearDown() {
+        AutomationContext.refreshContext();
+    }
+	
     @Test
     public void testShutdown() {
         MockVmManager ec2 = new MockVmManager();
         Reservation reservation = new Reservation();
         Instance instance = new Instance();
         instance.setState(new InstanceState().withCode(10));
-        String instanceId = "foobar";
+        String instanceId = "foo";
         instance.setInstanceId(instanceId);
         instance.setLaunchTime(AutomationUtils.modifyDate(new Date(),-5,Calendar.HOUR));
         reservation.setInstances(Arrays.asList(instance));