diff --git a/internal/builders/golang/build.go b/internal/builders/golang/build.go
index b0f4fd649..8cf8e05c1 100644
--- a/internal/builders/golang/build.go
+++ b/internal/builders/golang/build.go
@@ -81,7 +81,7 @@ func (*Builder) Build(ctx *context.Context, build config.Build, options api.Opti
 		Goarm:  target.arm,
 		Gomips: target.mips,
 		Extra: map[string]interface{}{
-			"Binary": filepath.Base(options.Path),
+			"Binary": strings.TrimSuffix(filepath.Base(options.Path), options.Ext),
 			"Ext":    options.Ext,
 			"ID":     build.ID,
 		},
diff --git a/internal/builders/golang/build_test.go b/internal/builders/golang/build_test.go
index a9629223a..ed4593237 100644
--- a/internal/builders/golang/build_test.go
+++ b/internal/builders/golang/build_test.go
@@ -117,16 +117,15 @@ func TestBuild(t *testing.T) {
 		var ext string
 		if strings.HasPrefix(target, "windows") {
 			ext = ".exe"
-		}
-		if target == "js_wasm" {
+		} else if target == "js_wasm" {
 			ext = ".wasm"
 		}
 		bin, terr := tmpl.New(ctx).Apply(build.Binary)
 		require.NoError(t, terr)
 		var err = Default.Build(ctx, build, api.Options{
 			Target: target,
-			Name:   bin,
-			Path:   filepath.Join(folder, "dist", target, bin),
+			Name:   bin + ext,
+			Path:   filepath.Join(folder, "dist", target, bin+ext),
 			Ext:    ext,
 		})
 		assert.NoError(t, err)
@@ -196,8 +195,8 @@ func TestBuild(t *testing.T) {
 			},
 		},
 		{
-			Name:   "bin/foo-v5.6.7",
-			Path:   filepath.Join(folder, "dist", "windows_amd64", "bin", "foo-v5.6.7"),
+			Name:   "bin/foo-v5.6.7.exe",
+			Path:   filepath.Join(folder, "dist", "windows_amd64", "bin", "foo-v5.6.7.exe"),
 			Goos:   "windows",
 			Goarch: "amd64",
 			Type:   artifact.Binary,
@@ -208,8 +207,8 @@ func TestBuild(t *testing.T) {
 			},
 		},
 		{
-			Name:   "bin/foo-v5.6.7",
-			Path:   filepath.Join(folder, "dist", "js_wasm", "bin", "foo-v5.6.7"),
+			Name:   "bin/foo-v5.6.7.wasm",
+			Path:   filepath.Join(folder, "dist", "js_wasm", "bin", "foo-v5.6.7.wasm"),
 			Goos:   "js",
 			Goarch: "wasm",
 			Type:   artifact.Binary,