diff --git a/go/logic/migrator.go b/go/logic/migrator.go
index b709b15..c84deb7 100644
--- a/go/logic/migrator.go
+++ b/go/logic/migrator.go
@@ -399,6 +399,8 @@ func (this *Migrator) Migrate() (err error) {
 	if err := this.initiateServer(); err != nil {
 		return err
 	}
+	defer this.server.RemoveSocketFile()
+
 	if this.migrationContext.CountTableRows {
 		if this.migrationContext.Noop {
 			log.Debugf("Noop operation; not really counting table rows")
diff --git a/go/logic/server.go b/go/logic/server.go
index f216af6..f21f824 100644
--- a/go/logic/server.go
+++ b/go/logic/server.go
@@ -47,6 +47,10 @@ func (this *Server) BindSocketFile() (err error) {
 	return nil
 }
 
+func (this *Server) RemoveSocketFile() (err error) {
+	return os.Remove(this.migrationContext.ServeSocketFile)
+}
+
 func (this *Server) BindTCPPort() (err error) {
 	if this.migrationContext.ServeTCPPort == 0 {
 		return nil