diff --git a/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeImageClientLiveTest.java b/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeImageClientLiveTest.java
new file mode 100644
index 0000000000..0989e653a4
--- /dev/null
+++ b/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeImageClientLiveTest.java
@@ -0,0 +1,33 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jclouds.hpcloud.compute.features;
+
+import org.jclouds.openstack.nova.v1_1.features.ImageClientLiveTest;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Michael Arnold
+ */
+@Test(groups = "live", testName = "HPCloudComputeImageClientLiveTest")
+public class HPCloudComputeImageClientLiveTest extends ImageClientLiveTest {
+    public HPCloudComputeImageClientLiveTest() {
+        provider = "hpcloud-compute";
+    }
+}
diff --git a/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeKeyPairClientLiveTest.java b/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeKeyPairClientLiveTest.java
index f7982fe934..0a7afe0704 100644
--- a/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeKeyPairClientLiveTest.java
+++ b/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeKeyPairClientLiveTest.java
@@ -18,7 +18,7 @@
  */
 package org.jclouds.hpcloud.compute.features;
 
-import org.jclouds.openstack.nova.v1_1.features.KeyPairClientLiveTest;
+import org.jclouds.openstack.nova.v1_1.extensions.KeyPairClientLiveTest;
 import org.testng.annotations.Test;
 
 /**
diff --git a/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeSecurityGroupClientLiveTest.java b/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeSecurityGroupClientLiveTest.java
new file mode 100644
index 0000000000..085982e277
--- /dev/null
+++ b/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeSecurityGroupClientLiveTest.java
@@ -0,0 +1,33 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jclouds.hpcloud.compute.features;
+
+import org.jclouds.openstack.nova.v1_1.extensions.SecurityGroupClientLiveTest;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Michael Arnold
+ */
+@Test(groups = "live", testName = "HPCloudComputeSecurityGroupClientLiveTest")
+public class HPCloudComputeSecurityGroupClientLiveTest extends SecurityGroupClientLiveTest {
+    public HPCloudComputeSecurityGroupClientLiveTest() {
+        provider = "hpcloud-compute";
+    }
+}