diff --git a/common/configtx/test/helper.go b/common/configtx/test/helper.go
index ad4a2207156..4889b484b75 100644
--- a/common/configtx/test/helper.go
+++ b/common/configtx/test/helper.go
@@ -85,7 +85,9 @@ func OrdererTemplate() configtx.Template {
 	return provisional.New(genConf).ChannelTemplate()
 }
 
-const sampleOrgID = "SAMPLE"
+// sampleOrgID apparently _must_ be set to DEFAULT or things break
+// Beware when changing!
+const sampleOrgID = "DEFAULT"
 
 // ApplicationOrgTemplate returns the SAMPLE org with MSP template
 func ApplicationOrgTemplate() configtx.Template {