diff --git a/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java b/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java
index 7ce7c4c4fd..aabd1526dd 100644
--- a/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java
+++ b/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java
@@ -77,7 +77,7 @@ public class ChefClientLiveTest {
       user = checkNotNull(System.getProperty("jclouds.test.user"));
       String keyfile = System.getProperty("jclouds.test.key");
       if (keyfile == null || keyfile.equals(""))
-         keyfile = System.getProperty("user.home") + "/chef/" + user + ".pem";
+         keyfile = System.getProperty("user.home") + "/.chef/" + user + ".pem";
       validatorConnection = createConnection(validator, Files.toString(new File(validatorKey),
                Charsets.UTF_8));
       adminConnection = createConnection(user, Files.toString(new File(keyfile), Charsets.UTF_8));
diff --git a/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java b/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java
index ca6e8b3f89..c11ed1b48a 100644
--- a/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java
+++ b/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java
@@ -40,7 +40,7 @@ public interface ComputeServiceConstants {
    static class Timeouts {
       @Inject(optional = true)
       @Named(PROPERTY_TIMEOUT_NODE_TERMINATED)
-      public long nodeTerminated = 600 * 1000;
+      public long nodeTerminated = 15 * 1000;
 
       @Inject(optional = true)
       @Named(PROPERTY_TIMEOUT_NODE_RUNNING)