diff --git a/rbd/metadata_test.go b/rbd/metadata_test.go
new file mode 100644
index 0000000..0949e6e
--- /dev/null
+++ b/rbd/metadata_test.go
@@ -0,0 +1,69 @@
+package rbd
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestImageMetadata(t *testing.T) {
+	metadataKey := "mykey"
+	metadataValue := "myvalue"
+
+	conn := radosConnect(t)
+
+	poolname := GetUUID()
+	err := conn.MakePool(poolname)
+	assert.NoError(t, err)
+
+	ioctx, err := conn.OpenIOContext(poolname)
+	require.NoError(t, err)
+
+	name := GetUUID()
+	err = quickCreate(ioctx, name, testImageSize, testImageOrder)
+	assert.NoError(t, err)
+
+	image := GetImage(ioctx, name)
+	// Set a metadata key/value on unopen image
+	err = image.SetMetadata(metadataKey, metadataValue)
+	assert.Equal(t, err, ErrImageNotOpen)
+	// Get the metadata value on unopen image
+	value, err := image.GetMetadata(metadataKey)
+	assert.Equal(t, err, ErrImageNotOpen)
+	assert.Equal(t, "", value)
+	// Remove the metadata key on unopen image
+	err = image.RemoveMetadata(metadataKey)
+	assert.Equal(t, err, ErrImageNotOpen)
+	// check key is removed on unopen image
+	value, err = image.GetMetadata(metadataKey)
+	assert.Equal(t, "", value)
+	assert.Equal(t, err, ErrImageNotOpen)
+
+	image, err = OpenImage(ioctx, name, NoSnapshot)
+	assert.NoError(t, err)
+
+	// Set a metadata key/value
+	err = image.SetMetadata(metadataKey, metadataValue)
+	assert.NoError(t, err)
+	// Get the metadata value
+	value, err = image.GetMetadata(metadataKey)
+	assert.NoError(t, err)
+	assert.Equal(t, metadataValue, value)
+	// Remove the metadata key
+	err = image.RemoveMetadata(metadataKey)
+	assert.NoError(t, err)
+	// check key is removed
+	value, err = image.GetMetadata(metadataKey)
+	assert.Equal(t, "", value)
+	assert.Error(t, err)
+
+	err = image.Close()
+	assert.NoError(t, err)
+	err = image.Remove()
+	assert.NoError(t, err)
+
+	ioctx.Destroy()
+	conn.DeletePool(poolname)
+	conn.Shutdown()
+}
diff --git a/rbd/rbd_test.go b/rbd/rbd_test.go
index 31f9c24..6ca0906 100644
--- a/rbd/rbd_test.go
+++ b/rbd/rbd_test.go
@@ -1082,67 +1082,6 @@ func TestTrashImage(t *testing.T) {
 	conn.Shutdown()
 }
 
-func TestImageMetadata(t *testing.T) {
-	metadataKey := "mykey"
-	metadataValue := "myvalue"
-
-	conn := radosConnect(t)
-
-	poolname := GetUUID()
-	err := conn.MakePool(poolname)
-	assert.NoError(t, err)
-
-	ioctx, err := conn.OpenIOContext(poolname)
-	require.NoError(t, err)
-
-	name := GetUUID()
-	err = quickCreate(ioctx, name, testImageSize, testImageOrder)
-	assert.NoError(t, err)
-
-	image := GetImage(ioctx, name)
-	// Set a metadata key/value on unopen image
-	err = image.SetMetadata(metadataKey, metadataValue)
-	assert.Equal(t, err, ErrImageNotOpen)
-	// Get the metadata value on unopen image
-	value, err := image.GetMetadata(metadataKey)
-	assert.Equal(t, err, ErrImageNotOpen)
-	assert.Equal(t, "", value)
-	// Remove the metadata key on unopen image
-	err = image.RemoveMetadata(metadataKey)
-	assert.Equal(t, err, ErrImageNotOpen)
-	// check key is removed on unopen image
-	value, err = image.GetMetadata(metadataKey)
-	assert.Equal(t, "", value)
-	assert.Equal(t, err, ErrImageNotOpen)
-
-	image, err = OpenImage(ioctx, name, NoSnapshot)
-	assert.NoError(t, err)
-
-	// Set a metadata key/value
-	err = image.SetMetadata(metadataKey, metadataValue)
-	assert.NoError(t, err)
-	// Get the metadata value
-	value, err = image.GetMetadata(metadataKey)
-	assert.NoError(t, err)
-	assert.Equal(t, metadataValue, value)
-	// Remove the metadata key
-	err = image.RemoveMetadata(metadataKey)
-	assert.NoError(t, err)
-	// check key is removed
-	value, err = image.GetMetadata(metadataKey)
-	assert.Equal(t, "", value)
-	assert.Error(t, err)
-
-	err = image.Close()
-	assert.NoError(t, err)
-	err = image.Remove()
-	assert.NoError(t, err)
-
-	ioctx.Destroy()
-	conn.DeletePool(poolname)
-	conn.Shutdown()
-}
-
 func TestClosedImage(t *testing.T) {
 	t.Skipf("many of the following functions cause a panic or hang, skip this test")