diff --git a/internal/distro/rhel85/distro_internal_test.go b/internal/distro/rhel85/distro_internal_test.go
index 5b11f935a..e151cbcec 100644
--- a/internal/distro/rhel85/distro_internal_test.go
+++ b/internal/distro/rhel85/distro_internal_test.go
@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/osbuild/osbuild-composer/internal/blueprint"
-	"github.com/osbuild/osbuild-composer/internal/disk"
 	"github.com/osbuild/osbuild-composer/internal/distro"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -32,18 +31,6 @@ var mountpoints = []blueprint.FilesystemCustomization{
 /* #nosec G404 */
 var rng = rand.New(rand.NewSource(0))
 
-func containsMountpoint(expected []disk.Partition, mountpoint string) bool {
-	for _, p := range expected {
-		if p.Filesystem == nil {
-			continue
-		}
-		if p.Filesystem.Mountpoint == mountpoint {
-			return true
-		}
-	}
-	return false
-}
-
 func TestDistro_UnsupportedArch(t *testing.T) {
 	testBasicImageType.arch = &architecture{
 		name: "unsupported_arch",
@@ -61,8 +48,7 @@ func TestDistro_DefaultPartitionTables(t *testing.T) {
 		pt, err := testBasicImageType.getPartitionTable(mountpoints, distro.ImageOptions{}, rng)
 		require.Nil(t, err)
 		for _, m := range mountpoints {
-			contains := containsMountpoint(pt.Partitions, m.Mountpoint)
-			assert.True(t, contains)
+			assert.True(t, pt.ContainsMountpoint(m.Mountpoint))
 		}
 	}
 }
@@ -77,8 +63,7 @@ func TestDistro_Ec2PartitionTables(t *testing.T) {
 		if _, exists := testEc2ImageType.basePartitionTables[archName]; exists {
 			require.Nil(t, err)
 			for _, m := range mountpoints {
-				contains := containsMountpoint(pt.Partitions, m.Mountpoint)
-				assert.True(t, contains)
+				assert.True(t, pt.ContainsMountpoint(m.Mountpoint))
 			}
 		} else {
 			require.EqualError(t, err, "unknown arch: "+testEc2ImageType.arch.name)
diff --git a/internal/distro/rhel86/distro_internal_test.go b/internal/distro/rhel86/distro_internal_test.go
index cf0bc04dc..bdea61c2a 100644
--- a/internal/distro/rhel86/distro_internal_test.go
+++ b/internal/distro/rhel86/distro_internal_test.go
@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/osbuild/osbuild-composer/internal/blueprint"
-	"github.com/osbuild/osbuild-composer/internal/disk"
 	"github.com/osbuild/osbuild-composer/internal/distro"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -32,18 +31,6 @@ var mountpoints = []blueprint.FilesystemCustomization{
 /* #nosec G404 */
 var rng = rand.New(rand.NewSource(0))
 
-func containsMountpoint(expected []disk.Partition, mountpoint string) bool {
-	for _, p := range expected {
-		if p.Filesystem == nil {
-			continue
-		}
-		if p.Filesystem.Mountpoint == mountpoint {
-			return true
-		}
-	}
-	return false
-}
-
 func TestDistro_UnsupportedArch(t *testing.T) {
 	testBasicImageType.arch = &architecture{
 		name: "unsupported_arch",
@@ -61,8 +48,7 @@ func TestDistro_DefaultPartitionTables(t *testing.T) {
 		pt, err := testBasicImageType.getPartitionTable(mountpoints, distro.ImageOptions{}, rng)
 		require.Nil(t, err)
 		for _, m := range mountpoints {
-			contains := containsMountpoint(pt.Partitions, m.Mountpoint)
-			assert.True(t, contains)
+			assert.True(t, pt.ContainsMountpoint(m.Mountpoint))
 		}
 	}
 }
@@ -77,8 +63,7 @@ func TestDistro_Ec2PartitionTables(t *testing.T) {
 		if _, exists := testEc2ImageType.basePartitionTables[archName]; exists {
 			require.Nil(t, err)
 			for _, m := range mountpoints {
-				contains := containsMountpoint(pt.Partitions, m.Mountpoint)
-				assert.True(t, contains)
+				assert.True(t, pt.ContainsMountpoint(m.Mountpoint))
 			}
 		} else {
 			require.EqualError(t, err, "unknown arch: "+testEc2ImageType.arch.name)