diff --git a/Makefile b/Makefile
index df0aa387e..be9695eed 100644
--- a/Makefile
+++ b/Makefile
@@ -52,8 +52,8 @@ test-unit:
 
 test-integration:
 	mkdir -p tests/results-integration
-	$(GO) test $(GO_MOD_FLAGS) $(GO_BUILD_FLAGS) -coverprofile=tests/results-integration/cover-additional.out -race -count=1 ./internal/pkg/... -run TestIntegrationAdditional
-	$(GO) test $(GO_MOD_FLAGS) $(GO_BUILD_FLAGS) -coverprofile=tests/results-integration/cover-release.out -race -count=1 ./internal/pkg/... -run TestIntegrationRelease
+	$(GO) test $(GO_MOD_FLAGS) $(GO_BUILD_FLAGS) -coverprofile=tests/results-integration/cover-additional.out -race -count=1 ./internal/pkg/... -run 'TestIntegrationAdditional$'
+	$(GO) test $(GO_MOD_FLAGS) $(GO_BUILD_FLAGS) -coverprofile=tests/results-integration/cover-release.out -race -count=1 ./internal/pkg/... -run 'TestIntegrationRelease$'
 	$(GO) test $(GO_MOD_FLAGS) $(GO_BUILD_FLAGS) -coverprofile=tests/results-integration/cover-additional.out -race -count=1 ./internal/pkg/... -run TestIntegrationAdditionalM2M
 	$(GO) test $(GO_MOD_FLAGS) $(GO_BUILD_FLAGS) -coverprofile=tests/results-integration/cover-release.out -race -count=1 ./internal/pkg/... -run TestIntegrationReleaseM2M
 	make -C v1 test-integration
diff --git a/internal/pkg/cli/release_integration_test.go b/internal/pkg/cli/release_integration_test.go
index 3cab88548..36a5e0d22 100644
--- a/internal/pkg/cli/release_integration_test.go
+++ b/internal/pkg/cli/release_integration_test.go
@@ -169,7 +169,7 @@ func (suite *TestEnvironmentRelease) runMirror2Disk(t *testing.T) {
 	err := os.MkdirAll(resultFolder, 0755)
 	assert.NoError(t, err, "should not fail creating a temp folder for results")
 
-	ocmirror.SetArgs([]string{"-c", suite.tempFolder + "/isc.yaml", "--v2", "-p", "56001", "--src-tls-verify=false", "--dest-tls-verify=false", "file://" + resultFolder})
+	ocmirror.SetArgs([]string{"-c", suite.tempFolder + "/isc.yaml", "--v2", "-p", "56001", "--src-tls-verify=false", "--dest-tls-verify=false", "--remove-signatures", "file://" + resultFolder})
 	err = ocmirror.Execute()
 	assert.NoError(t, err, "should not fail executing oc-mirror")
 
diff --git a/internal/testutils/testutils.go b/internal/testutils/testutils.go
index 83a8d14d6..c6b3c2411 100644
--- a/internal/testutils/testutils.go
+++ b/internal/testutils/testutils.go
@@ -13,6 +13,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"text/template"
 
@@ -23,6 +24,7 @@ import (
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/empty"
 	"github.com/google/go-containerregistry/pkg/v1/layout"
+	"github.com/google/go-containerregistry/pkg/v1/mutate"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
 	"github.com/openshift/oc-mirror/v2/internal/pkg/image"
 )
@@ -127,6 +129,17 @@ func buildAndPushFakeImage(content map[string][]byte, imgRef string, dir string)
 		return "", err
 	}
 	i, _ := crane.Image(content)
+	// Set the platform to match the local GOARCH
+	cfg, err := i.ConfigFile()
+	if err != nil {
+		return "", err
+	}
+	cfg.OS = runtime.GOOS
+	cfg.Architecture = runtime.GOARCH
+	i, err = mutate.ConfigFile(i, cfg)
+	if err != nil {
+		return "", err
+	}
 	if err := crane.Push(i, tag.String()); err != nil {
 		return "", err
 	}