diff --git a/generator/bindtests.ml b/generator/bindtests.ml
index 6db017973..306dc834c 100644
--- a/generator/bindtests.ml
+++ b/generator/bindtests.ml
@@ -810,6 +810,7 @@ and generate_golang_bindtests () =
   pr "    if errno != nil {\n";
   pr "        panic (fmt.Sprintf (\"could not create handle: %%s\", errno))\n";
   pr "    }\n";
+  pr "    defer g.Close ()\n";
   pr "\n";
 
   generate_lang_bindtests (
diff --git a/golang/src/libguestfs.org/guestfs/guestfs_020_create_test.go b/golang/src/libguestfs.org/guestfs/guestfs_020_create_test.go
index 6f509cd2b..a36838a7a 100644
--- a/golang/src/libguestfs.org/guestfs/guestfs_020_create_test.go
+++ b/golang/src/libguestfs.org/guestfs/guestfs_020_create_test.go
@@ -21,8 +21,9 @@ package guestfs
 import "testing"
 
 func Test020Create (t *testing.T) {
-	_, err := Create ()
+	g, err := Create ()
 	if err != nil {
 		t.Errorf ("could not create handle: %s", err)
 	}
+	g.Close ()
 }
diff --git a/golang/src/libguestfs.org/guestfs/guestfs_030_create_flags_test.go b/golang/src/libguestfs.org/guestfs/guestfs_030_create_flags_test.go
index eb30f717c..f5c8c2dae 100644
--- a/golang/src/libguestfs.org/guestfs/guestfs_030_create_flags_test.go
+++ b/golang/src/libguestfs.org/guestfs/guestfs_030_create_flags_test.go
@@ -25,10 +25,12 @@ func Test030CreateFlags (t *testing.T) {
 	if err != nil {
 		t.Errorf ("could not create handle: %s", err)
 	}
+	g.Close ()
 	g, err = Create_flags (CREATE_NO_ENVIRONMENT)
 	if err != nil {
 		t.Errorf ("could not create handle: %s", err)
 	}
+	defer g.Close ()
 	if err := g.Parse_environment (); err != nil {
 		t.Errorf ("could not parse environment: %s", err)
 	}
diff --git a/golang/src/libguestfs.org/guestfs/guestfs_050_handle_properties_test.go b/golang/src/libguestfs.org/guestfs/guestfs_050_handle_properties_test.go
index da5dfc8dc..e136d1c51 100644
--- a/golang/src/libguestfs.org/guestfs/guestfs_050_handle_properties_test.go
+++ b/golang/src/libguestfs.org/guestfs/guestfs_050_handle_properties_test.go
@@ -25,6 +25,7 @@ func Test050HandleProperties (t *testing.T) {
 	if errno != nil {
 		t.Errorf ("could not create handle: %s", errno)
 	}
+	defer g.Close ()
 
 	v, err := g.Get_verbose ()
 	if err != nil {
diff --git a/golang/src/libguestfs.org/guestfs/guestfs_070_optargs_test.go b/golang/src/libguestfs.org/guestfs/guestfs_070_optargs_test.go
index ab05e8686..c72a39aef 100644
--- a/golang/src/libguestfs.org/guestfs/guestfs_070_optargs_test.go
+++ b/golang/src/libguestfs.org/guestfs/guestfs_070_optargs_test.go
@@ -25,6 +25,7 @@ func Test070Optargs (t *testing.T) {
 	if errno != nil {
 		t.Errorf ("could not create handle: %s", errno)
 	}
+	defer g.Close ()
 	err := g.Add_drive ("/dev/null", nil)
 	if err != nil {
 		t.Errorf ("%s", err)
diff --git a/golang/src/libguestfs.org/guestfs/guestfs_100_launch_test.go b/golang/src/libguestfs.org/guestfs/guestfs_100_launch_test.go
index 1d7756853..7aa6522e7 100644
--- a/golang/src/libguestfs.org/guestfs/guestfs_100_launch_test.go
+++ b/golang/src/libguestfs.org/guestfs/guestfs_100_launch_test.go
@@ -29,11 +29,13 @@ func Test100Launch (t *testing.T) {
 	if errno != nil {
 		t.Errorf ("could not create handle: %s", errno)
 	}
+	defer g.Close ()
 
 	f, ferr := os.Create ("test.img")
 	if ferr != nil {
 		t.Errorf ("could not create file: %s", ferr)
 	}
+	defer os.Remove ("test.img")
 	if ferr := f.Truncate (500 * 1024 * 1024); ferr != nil {
 		t.Errorf ("could not truncate file: %s", ferr)
 	}
@@ -105,12 +107,6 @@ func Test100Launch (t *testing.T) {
 	if err != nil {
 		t.Errorf ("%s", err)
 	}
-	err = g.Close ()
-	if err != nil {
-		t.Errorf ("%s", err)
-	}
-
-	os.Remove ("test.img")
 }
 
 /* - declared in guestfs_900_rstringlist_test.go
diff --git a/golang/src/libguestfs.org/guestfs/guestfs_900_rstringlist_test.go b/golang/src/libguestfs.org/guestfs/guestfs_900_rstringlist_test.go
index 091ad8420..09c4377d6 100644
--- a/golang/src/libguestfs.org/guestfs/guestfs_900_rstringlist_test.go
+++ b/golang/src/libguestfs.org/guestfs/guestfs_900_rstringlist_test.go
@@ -27,6 +27,7 @@ func Test900RStringLits (t *testing.T) {
 	if errno != nil {
 		t.Errorf ("could not create handle: %s", errno)
 	}
+	defer g.Close ()
 
 	actual, err := g.Internal_test_rstringlist ("16")
 	if err != nil {