diff --git a/src/cmd/compile/internal/base/flag.go b/src/cmd/compile/internal/base/flag.go
index 1ac2cecc61e..1d211e0a2dd 100644
--- a/src/cmd/compile/internal/base/flag.go
+++ b/src/cmd/compile/internal/base/flag.go
@@ -264,6 +264,9 @@ func ParseFlags() {
 
 	if Debug.Converthash != "" {
 		ConvertHash = NewHashDebug("converthash", Debug.Converthash, nil)
+	} else {
+		// quietly disable the convert hash changes
+		ConvertHash = NewHashDebug("converthash", "qn", nil)
 	}
 	if Debug.Fmahash != "" {
 		FmaHash = NewHashDebug("fmahash", Debug.Fmahash, nil)
diff --git a/test/codegen/math.go b/test/codegen/math.go
index 5787657d2bc..9ef881a9afc 100644
--- a/test/codegen/math.go
+++ b/test/codegen/math.go
@@ -1,4 +1,4 @@
-// asmcheck
+// asmcheck -gcflags=-d=converthash=qy
 
 // Copyright 2018 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/convert5.go b/test/convert5.go
index 1bd74abdad0..df247ca0b9b 100644
--- a/test/convert5.go
+++ b/test/convert5.go
@@ -1,4 +1,4 @@
-// run
+// run -gcflags=-d=converthash=qy
 
 // Copyright 2020 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style