diff --git a/internal/distro/fedora30/distro_test.go b/internal/distro/fedora30/distro_test.go
index 3775277eb..dda60d6eb 100644
--- a/internal/distro/fedora30/distro_test.go
+++ b/internal/distro/fedora30/distro_test.go
@@ -1,9 +1,12 @@
 package fedora30_test
 
 import (
-	"github.com/osbuild/osbuild-composer/internal/distro/fedora30"
 	"reflect"
 	"testing"
+
+	"github.com/osbuild/osbuild-composer/internal/distro/distro_test_common"
+	"github.com/osbuild/osbuild-composer/internal/distro/fedora30"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestFilenameFromType(t *testing.T) {
@@ -137,3 +140,233 @@ func TestImageType_BuildPackages(t *testing.T) {
 		}
 	}
 }
+
+func TestImageType_Name(t *testing.T) {
+	distro := fedora30.New()
+	imgMap := []struct {
+		arch     string
+		imgNames []string
+	}{
+		{
+			arch: "x86_64",
+			imgNames: []string{
+				"ami",
+				"ext4-filesystem",
+				"partitioned-disk",
+				"qcow2",
+				"openstack",
+				"tar",
+				"vhd",
+				"vmdk",
+			},
+		},
+		{
+			arch: "aarch64",
+			imgNames: []string{
+				"ami",
+				"ext4-filesystem",
+				"partitioned-disk",
+				"qcow2",
+				"openstack",
+				"tar",
+			},
+		},
+	}
+	for _, mapping := range imgMap {
+		arch, err := distro.GetArch(mapping.arch)
+		assert.Nil(t, err)
+		if err == nil {
+			for _, imgName := range mapping.imgNames {
+				imgType, err := arch.GetImageType(imgName)
+				assert.Nil(t, err)
+				if err == nil {
+					assert.Equalf(t, imgName, imgType.Name(), "arch: %s", mapping.arch)
+				}
+			}
+		}
+	}
+}
+
+func TestImageType_Size(t *testing.T) {
+	const gigaByte = 1024 * 1024 * 1024
+	sizeMap := []struct {
+		name       string
+		inputSize  uint64
+		outputSize uint64
+	}{
+		{
+			name:       "ami",
+			inputSize:  6*gigaByte + 1,
+			outputSize: 6*gigaByte + 1,
+		},
+		{
+			name:       "ami",
+			inputSize:  0,
+			outputSize: 6 * gigaByte,
+		},
+		{
+			name:       "vhd",
+			inputSize:  10 * gigaByte,
+			outputSize: 10 * gigaByte,
+		},
+		{
+			name:       "vhd",
+			inputSize:  10*gigaByte - 1,
+			outputSize: 10 * gigaByte,
+		},
+	}
+
+	distro := fedora30.New()
+	arch, err := distro.GetArch("x86_64")
+	assert.Nil(t, err)
+	if err == nil {
+		for _, mapping := range sizeMap {
+			imgType, err := arch.GetImageType(mapping.name)
+			assert.Nil(t, err)
+			if err == nil {
+				size := imgType.Size(mapping.inputSize)
+				assert.Equalf(t, mapping.outputSize, size, "Image type: %s, input size: %d, expected: %d, got: %d",
+					mapping.name, mapping.inputSize, mapping.outputSize, size)
+			}
+		}
+	}
+}
+
+func TestImageType_BasePackages(t *testing.T) {
+	pkgMaps := []struct {
+		name               string
+		basePackages       []string
+		bootloaderPackages []string
+		excludedPackages   []string
+		bootable           bool
+	}{
+		{
+			name: "ami",
+			basePackages: []string{
+				"@Core",
+				"chrony",
+				"kernel",
+				"selinux-policy-targeted",
+				"langpacks-en",
+				"libxcrypt-compat",
+				"xfsprogs",
+				"cloud-init",
+				"checkpolicy",
+				"net-tools",
+			},
+			bootloaderPackages: []string{
+				"dracut-config-generic",
+				"grub2-pc",
+			},
+			excludedPackages: []string{
+				"dracut-config-rescue",
+			},
+			bootable: true,
+		},
+		{
+			name: "ext4-filesystem",
+			basePackages: []string{
+				"policycoreutils",
+				"selinux-policy-targeted",
+				"kernel",
+				"firewalld",
+				"chrony",
+				"langpacks-en",
+			},
+			excludedPackages: []string{
+				"dracut-config-rescue",
+			},
+			bootable: true,
+		},
+		{
+			name: "openstack",
+			basePackages: []string{
+				"@Core",
+				"chrony",
+				"kernel",
+				"selinux-policy-targeted",
+				"spice-vdagent",
+				"qemu-guest-agent",
+				"xen-libs",
+				"langpacks-en",
+				"cloud-init",
+				"libdrm",
+			},
+			bootloaderPackages: []string{
+				"dracut-config-generic",
+				"grub2-pc",
+			},
+			excludedPackages: []string{
+				"dracut-config-rescue",
+			},
+			bootable: true,
+		},
+	}
+	distro := fedora30.New()
+	arch, err := distro.GetArch("x86_64")
+	assert.Nil(t, err)
+
+	for _, pkgMap := range pkgMaps {
+		imgType, err := arch.GetImageType(pkgMap.name)
+		assert.Nil(t, err)
+		basePackages, excludedPackages := imgType.BasePackages()
+		assert.Equalf(
+			t,
+			append(pkgMap.basePackages, pkgMap.bootloaderPackages...),
+			basePackages,
+			"image type: %s",
+			pkgMap.name,
+		)
+		assert.Equalf(t, pkgMap.excludedPackages, excludedPackages, "image type: %s", pkgMap.name)
+	}
+}
+
+func TestDistro_Manifest(t *testing.T) {
+	distro_test_common.TestDistro_Manifest(t, "../../../../test/cases/", "f30*", fedora30.New())
+}
+
+func TestFedora30_ListArches(t *testing.T) {
+	distro := fedora30.New()
+	arches := distro.ListArches()
+	assert.Equal(t, []string{"aarch64", "x86_64"}, arches)
+}
+
+func TestFedora30_GetArch(t *testing.T) {
+	distro := fedora30.New()
+	arches := []struct {
+		name          string
+		errorExpected bool
+	}{
+		{
+			name: "x86_64",
+		},
+		{
+			name: "aarch64",
+		},
+		{
+			name:          "foo-arch",
+			errorExpected: true,
+		},
+	}
+
+	for _, a := range arches {
+		actualArch, err := distro.GetArch(a.name)
+		if !a.errorExpected {
+			assert.Equal(t, a.name, actualArch.Name())
+			assert.Nil(t, err)
+		} else {
+			assert.Nil(t, actualArch)
+			assert.NotNil(t, err)
+		}
+	}
+}
+
+func TestFedora30_Name(t *testing.T) {
+	distro := fedora30.New()
+	assert.Equal(t, "fedora-30", distro.Name())
+}
+
+func TestFedora30_ModulePlatformID(t *testing.T) {
+	distro := fedora30.New()
+	assert.Equal(t, "platform:f30", distro.ModulePlatformID())
+}