diff --git a/cloudroast/glance/smoke/image_operations_smoke.py b/cloudroast/glance/smoke/image_operations_smoke.py
index 6c055076..00e808e7 100644
--- a/cloudroast/glance/smoke/image_operations_smoke.py
+++ b/cloudroast/glance/smoke/image_operations_smoke.py
@@ -53,6 +53,24 @@ class ImageOperationsSmoke(ImagesFixture):
         cls.images.behaviors.resources.release()
         super(ImageOperationsSmoke, cls).tearDownClass()
 
+    def test_register_image(self):
+        """
+        @summary: Register an image
+
+        1) Register an image
+        2) Verify that the response code is 201
+        3) Add the image to the resource pool for deletion
+        """
+
+        resp = self.images.client.register_image(
+            name=rand_name('image_operations_smoke'))
+        self.assertEqual(
+            resp.status_code, 201,
+            Messages.STATUS_CODE_MSG.format(201, resp.status_code))
+        image = resp.entity
+
+        self.resources.add(image.id_, self.images.client.delete_image)
+
     @data_driven_test(ImagesDatasetListGenerator.ListImagesSmoke())
     def ddtest_list_images(self, params):
         """
diff --git a/cloudroast/glance/smoke/skippable/registered_image_operations_smoke.py b/cloudroast/glance/smoke/skippable/registered_image_operations_smoke.py
index 09c9835b..3cefa937 100644
--- a/cloudroast/glance/smoke/skippable/registered_image_operations_smoke.py
+++ b/cloudroast/glance/smoke/skippable/registered_image_operations_smoke.py
@@ -46,24 +46,6 @@ class RegisteredImageOperationsSmoke(ImagesFixture):
         cls.images.client.store_image_file(
             cls.alt_registered_image.id_, cls.file_data)
 
-    def test_register_image(self):
-        """
-        @summary: Register an image
-
-        1) Register an image
-        2) Verify that the response code is 201
-        3) Add the image to the resource pool for deletion
-        """
-
-        resp = self.images.client.register_image(
-            name=rand_name('registered_image_operations_smoke'))
-        self.assertEqual(
-            resp.status_code, 201,
-            Messages.STATUS_CODE_MSG.format(201, resp.status_code))
-        image = resp.entity
-
-        self.resources.add(image.id_, self.images.client.delete_image)
-
     @unittest.skipUnless(images_config.allow_put_image_file,
                          'Functionality disabled with provided endpoint')
     def test_store_image_file(self):