diff --git a/builder/vsphere/iso/builder.go b/builder/vsphere/iso/builder.go
index a7f6f29cb..e5f3a183f 100644
--- a/builder/vsphere/iso/builder.go
+++ b/builder/vsphere/iso/builder.go
@@ -77,40 +77,40 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&common.StepConfigParams{
 			Config: &b.config.ConfigParamsConfig,
 		},
+		&packerCommon.StepCreateFloppy{
+			Files:       b.config.FloppyFiles,
+			Directories: b.config.FloppyDirectories,
+			Label:       b.config.FloppyLabel,
+		},
+		&StepAddFloppy{
+			Config:                     &b.config.FloppyConfig,
+			Datastore:                  b.config.Datastore,
+			Host:                       b.config.Host,
+			SetHostForDatastoreUploads: b.config.SetHostForDatastoreUploads,
+		},
+		&common.StepHTTPIPDiscover{
+			HTTPIP:  b.config.BootConfig.HTTPIP,
+			Network: b.config.WaitIpConfig.GetIPNet(),
+		},
+		&packerCommon.StepHTTPServer{
+			HTTPDir:     b.config.HTTPDir,
+			HTTPPortMin: b.config.HTTPPortMin,
+			HTTPPortMax: b.config.HTTPPortMax,
+			HTTPAddress: b.config.HTTPAddress,
+		},
+		&common.StepRun{
+			Config:   &b.config.RunConfig,
+			SetOrder: true,
+		},
+		&common.StepBootCommand{
+			Config: &b.config.BootConfig,
+			Ctx:    b.config.ctx,
+			VMName: b.config.VMName,
+		},
 	)
 
 	if b.config.Comm.Type != "none" {
 		steps = append(steps,
-			&packerCommon.StepCreateFloppy{
-				Files:       b.config.FloppyFiles,
-				Directories: b.config.FloppyDirectories,
-				Label:       b.config.FloppyLabel,
-			},
-			&common.StepAddFloppy{
-				Config:                     &b.config.FloppyConfig,
-				Datastore:                  b.config.Datastore,
-				Host:                       b.config.Host,
-				SetHostForDatastoreUploads: b.config.SetHostForDatastoreUploads,
-			},
-			&common.StepHTTPIPDiscover{
-				HTTPIP:  b.config.BootConfig.HTTPIP,
-				Network: b.config.WaitIpConfig.GetIPNet(),
-			},
-			&packerCommon.StepHTTPServer{
-				HTTPDir:     b.config.HTTPDir,
-				HTTPPortMin: b.config.HTTPPortMin,
-				HTTPPortMax: b.config.HTTPPortMax,
-				HTTPAddress: b.config.HTTPAddress,
-			},
-			&common.StepRun{
-				Config:   &b.config.RunConfig,
-				SetOrder: true,
-			},
-			&common.StepBootCommand{
-				Config: &b.config.BootConfig,
-				Ctx:    b.config.ctx,
-				VMName: b.config.VMName,
-			},
 			&common.StepWaitForIp{
 				Config: &b.config.WaitIpConfig,
 			},
@@ -123,15 +123,15 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			&common.StepShutdown{
 				Config: &b.config.ShutdownConfig,
 			},
-			&common.StepRemoveFloppy{
-				Datastore: b.config.Datastore,
-				Host:      b.config.Host,
-			},
 		)
 	}
 
 	steps = append(steps,
-		&common.StepRemoveCDRom{
+		&StepRemoveFloppy{
+			Datastore: b.config.Datastore,
+			Host:      b.config.Host,
+		},
+		&StepRemoveCDRom{
 			Config: &b.config.RemoveCDRomConfig,
 		},
 		&common.StepCreateSnapshot{