diff --git a/core/src/test/java/org/jclouds/domain/CredentialsTest.java b/core/src/test/java/org/jclouds/domain/CredentialsTest.java
index 0a4d623de2..7287e22e2d 100644
--- a/core/src/test/java/org/jclouds/domain/CredentialsTest.java
+++ b/core/src/test/java/org/jclouds/domain/CredentialsTest.java
@@ -51,6 +51,27 @@ public class CredentialsTest {
       assertEquals(creds.key, "pa$sword");
    }
 
+   public void testTerremark() {
+      Credentials creds = Credentials.parse(URI
+               .create("compute://user%40domain:password@terremark"));
+      assertEquals(creds.account, "user@domain");
+      assertEquals(creds.key, "password");
+   }
+
+   public void testTerremark2() {
+      Credentials creds = Credentials.parse(URI
+               .create("compute://user%40domain:passw%40rd@terremark"));
+      assertEquals(creds.account, "user@domain");
+      assertEquals(creds.key, "passw@rd");
+   }
+
+   public void testTerremark3() {
+      Credentials creds = Credentials.parse(URI
+               .create("compute://user%40domain:AbC%21%40943%21@terremark"));
+      assertEquals(creds.account, "user@domain");
+      assertEquals(creds.key, "AbC!@943!");
+   }
+
    public void testCloudFiles() {
       Credentials creds = Credentials.parse(URI
                .create("compute://account:h3c@cloudfiles/container-hyphen/prefix"));
@@ -61,8 +82,8 @@ public class CredentialsTest {
 
    public void testS3() {
 
-      Credentials creds = Credentials.parse(URI
-               .create("compute://0AB:aA%2B%2F0@s3/buck-et/prefix"));
+      Credentials creds = Credentials
+               .parse(URI.create("compute://0AB:aA%2B%2F0@s3/buck-et/prefix"));
       assertEquals(creds.account, "0AB");
       assertEquals(creds.key, "aA+/0");
    }
diff --git a/core/src/test/java/org/jclouds/util/HttpUtilsTest.java b/core/src/test/java/org/jclouds/util/HttpUtilsTest.java
index de5c2a71a0..101d6eda92 100644
--- a/core/src/test/java/org/jclouds/util/HttpUtilsTest.java
+++ b/core/src/test/java/org/jclouds/util/HttpUtilsTest.java
@@ -77,6 +77,12 @@ public class HttpUtilsTest extends PerformanceTest {
       assertEquals(creds, URI.create("compute://user%40domain:passw%40rd@terremark"));
    }
 
+   public void testTerremark3() {
+      URI creds = HttpUtils.createUri("compute://user@domain:AbC!@943!@terremark");
+      assertEquals(creds.getUserInfo(), "user@domain:AbC!@943!");
+      assertEquals(creds, URI.create("compute://user%40domain:AbC%21%40943%21@terremark"));
+   }
+
    public void testCloudFiles() {
       URI creds = HttpUtils.createUri("compute://account:h3c@cloudfiles/container-hyphen/prefix");
       assertEquals(creds, URI.create("compute://account:h3c@cloudfiles/container-hyphen/prefix"));