diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientExpectTest.java b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientExpectTest.java
new file mode 100644
index 0000000000..0af3410623
--- /dev/null
+++ b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientExpectTest.java
@@ -0,0 +1,31 @@
+/**
+ * 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.openstack.nova.v1_1.features;
+
+import org.jclouds.openstack.nova.v1_1.internal.BaseNovaRestClientExpectTest;
+import org.testng.annotations.Test;
+
+/**
+ * Tests annotation parsing of {@code ImageAsyncClient}
+ *
+ * @author Michael Arnold
+ */
+@Test(groups = "unit", testName = "ImageAsyncClientTest")
+public class ImageClientExpectTest  extends BaseNovaRestClientExpectTest {
+}
diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientLiveTest.java b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientLiveTest.java
new file mode 100644
index 0000000000..2c26b1fe82
--- /dev/null
+++ b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientLiveTest.java
@@ -0,0 +1,79 @@
+/**
+ * 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.openstack.nova.v1_1.features;
+
+import org.jclouds.openstack.domain.Resource;
+import org.jclouds.openstack.nova.v1_1.domain.Image;
+import org.jclouds.openstack.nova.v1_1.internal.BaseNovaClientLiveTest;
+import org.testng.annotations.Test;
+
+import java.util.Set;
+
+import static org.testng.Assert.*;
+
+/**
+ * Tests behavior of {@code ImageClient}
+ *
+ * @author Michael Arnold
+ */
+@Test(groups = "live", testName = "ImageClientLiveTest")
+public class ImageClientLiveTest extends BaseNovaClientLiveTest {
+
+    @Test
+    public void testListImages() throws Exception {
+        for (String regionId : context.getApi().getConfiguredRegions()) {
+            ImageClient client = context.getApi().getImageClientForRegion(regionId);
+            Set<Resource> response = client.listImages();
+            assert null != response;
+            assertTrue(response.size() >= 0);
+            for (Resource image : response) {
+                Image newDetails = client.getImage(image.getId());
+                assertEquals(newDetails.getId(), image.getId());
+                assertEquals(newDetails.getName(), image.getName());
+                assertEquals(newDetails.getLinks(), image.getLinks());
+            }
+        }
+    }
+
+    @Test
+    public void testListImagesInDetail() throws Exception {
+        for (String regionId : context.getApi().getConfiguredRegions()) {
+            ImageClient client = context.getApi().getImageClientForRegion(regionId);
+            Set<Image> response = client.listImagesInDetail();
+            assert null != response;
+            assertTrue(response.size() >= 0);
+            for (Image image : response) {
+                Image newDetails = client.getImage(image.getId());
+                assertEquals(newDetails.getId(), image.getId());
+                assertEquals(newDetails.getName(), image.getName());
+                assertEquals(newDetails.getLinks(), image.getLinks());
+                assertEquals(newDetails.getCreated(), image.getCreated());
+                assertEquals(newDetails.getMinDisk(), image.getMinDisk());
+                assertEquals(newDetails.getMinRam(), image.getMinRam());
+                assertEquals(newDetails.getProgress(), image.getProgress());
+                assertEquals(newDetails.getStatus(), image.getStatus());
+                assertEquals(newDetails.getServer(), image.getServer());
+                assertEquals(newDetails.getTenantId(), image.getTenantId());
+                assertEquals(newDetails.getUpdated(), image.getUpdated());
+                assertEquals(newDetails.getUserId(), image.getUserId());
+            }
+        }
+    }
+}
+