diff --git a/builder/vsphere/iso/config.go b/builder/vsphere/iso/config.go
index 68b4913c7..aee0fe14f 100644
--- a/builder/vsphere/iso/config.go
+++ b/builder/vsphere/iso/config.go
@@ -63,11 +63,9 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 	warnings := make([]string, 0)
 	errs := new(packer.MultiError)
 
-	if c.ISOUrls != nil {
-		isoWarnings, isoErrs := c.ISOConfig.Prepare(&c.ctx)
-		warnings = append(warnings, isoWarnings...)
-		errs = packer.MultiErrorAppend(errs, isoErrs...)
-	}
+	isoWarnings, isoErrs := c.ISOConfig.Prepare(&c.ctx)
+	warnings = append(warnings, isoWarnings...)
+	errs = packer.MultiErrorAppend(errs, isoErrs...)
 
 	errs = packer.MultiErrorAppend(errs, c.ConnectConfig.Prepare()...)
 	errs = packer.MultiErrorAppend(errs, c.CreateConfig.Prepare()...)
diff --git a/fix/fixer_pp_docker_tag_tags_test.go b/fix/fixer_pp_docker_tag_tags_test.go
index 957f90ba9..150db3dfa 100644
--- a/fix/fixer_pp_docker_tag_tags_test.go
+++ b/fix/fixer_pp_docker_tag_tags_test.go
@@ -47,6 +47,7 @@ func TestFixerDockerTags_Fix(t *testing.T) {
 
 	output, err := f.Fix(input)
 	assert.NoError(t, err)
-
-	assert.Equalf(t, expected, output, "should have removed tag from template")
+	for k, v := range expected {
+		assert.EqualValues(t, v, output[k])
+	}
 }