diff --git a/.appveyor.yml b/.appveyor.yml
index e2c41a0f04..8f49a0472d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,6 +1,6 @@
 version: "{build}"
 
-stack: node 16.8.0
+stack: node 16.8.0, go 1.17.11
 
 environment:
   matrix:
diff --git a/pkg/visor/api.go b/pkg/visor/api.go
index 4905df491e..799485e3b3 100644
--- a/pkg/visor/api.go
+++ b/pkg/visor/api.go
@@ -776,6 +776,7 @@ func (v *Visor) Shutdown() error {
 	if v.restartCtx == nil {
 		return ErrMalformedRestartContext
 	}
+	defer os.Exit(0)
 	return v.Close()
 }
 
diff --git a/pkg/visor/init.go b/pkg/visor/init.go
index 262138d189..bb88b3d5d2 100644
--- a/pkg/visor/init.go
+++ b/pkg/visor/init.go
@@ -1057,6 +1057,11 @@ func initHypervisor(_ context.Context, v *Visor, log *logging.Logger) error {
 		cancel()
 	}()
 
+	v.pushCloseStack("hypervisor", func() error {
+		cancel()
+		return err
+	})
+
 	return nil
 }