diff --git a/providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKClientLiveTest.java b/providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKLoadBalancerClientLiveTest.java
similarity index 87%
rename from providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKClientLiveTest.java
rename to providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKLoadBalancerClientLiveTest.java
index 39826465b9..e0211bd2d6 100644
--- a/providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKClientLiveTest.java
+++ b/providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKLoadBalancerClientLiveTest.java
@@ -26,8 +26,8 @@ import org.testng.annotations.Test;
  * @author Dan Lo Bianco
  */
 @Test(groups = "live", singleThreaded = true)
-public class CloudLoadBalancersUKClientLiveTest extends LoadBalancerClientLiveTest {
-   public CloudLoadBalancersUKClientLiveTest() {
+public class CloudLoadBalancersUKLoadBalancerClientLiveTest extends LoadBalancerClientLiveTest {
+   public CloudLoadBalancersUKLoadBalancerClientLiveTest() {
       provider = "cloudloadbalancers-uk";
    }
 }
diff --git a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSClientLiveTest.java b/providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSNodeClientLiveTest.java
similarity index 82%
rename from providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSClientLiveTest.java
rename to providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSNodeClientLiveTest.java
index bfc2e78a5e..7ca7f2d8be 100644
--- a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSClientLiveTest.java
+++ b/providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSNodeClientLiveTest.java
@@ -18,7 +18,7 @@
  */
 package org.jclouds.rackspace.cloudloadbalancers;
 
-import org.jclouds.cloudloadbalancers.features.LoadBalancerClientLiveTest;
+import org.jclouds.cloudloadbalancers.features.NodeClientLiveTest;
 import org.testng.annotations.Test;
 
 /**
@@ -26,8 +26,8 @@ import org.testng.annotations.Test;
  * @author Dan Lo Bianco
  */
 @Test(groups = "live", singleThreaded = true)
-public class CloudLoadBalancersUSClientLiveTest extends LoadBalancerClientLiveTest {
-   public CloudLoadBalancersUSClientLiveTest() {
+public class CloudLoadBalancersUSNodeClientLiveTest extends NodeClientLiveTest {
+   public CloudLoadBalancersUSNodeClientLiveTest() {
       provider = "cloudloadbalancers-us";
    }
 }