diff --git a/modules/swagger-codegen/src/main/resources/go/README.mustache b/modules/swagger-codegen/src/main/resources/go/README.mustache
index e56e410ff6a..0b2c0bdd42b 100644
--- a/modules/swagger-codegen/src/main/resources/go/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/go/README.mustache
@@ -19,8 +19,8 @@ For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
 
 ## Installation
 Put the package under your project folder and add the following in import:
-```
-    "./{{packageName}}"
+```golang
+import "./{{packageName}}"
 ```
 
 ## Documentation for API Endpoints
@@ -45,23 +45,23 @@ Class | Method | HTTP request | Description
 {{#isApiKey}}- **Type**: API key 
 
 Example
-```
-	auth := context.WithValue(context.Background(), sw.ContextAPIKey, sw.APIKey{
-		Key: "APIKEY",
-		Prefix: "Bearer", // Omit if not necessary.
-	})
-    r, err := client.Service.Operation(auth, args)
+```golang
+auth := context.WithValue(context.Background(), sw.ContextAPIKey, sw.APIKey{
+	Key: "APIKEY",
+	Prefix: "Bearer", // Omit if not necessary.
+})
+r, err := client.Service.Operation(auth, args)
 ```
 {{/isApiKey}}
 {{#isBasic}}- **Type**: HTTP basic authentication
 
 Example
-```
-	auth := context.WithValue(context.Background(), sw.ContextBasicAuth, sw.BasicAuth{
-		UserName: "username",
-		Password: "password",
-	})
-    r, err := client.Service.Operation(auth, args)
+```golang
+auth := context.WithValue(context.Background(), sw.ContextBasicAuth, sw.BasicAuth{
+	UserName: "username",
+	Password: "password",
+})
+r, err := client.Service.Operation(auth, args)
 ```
 {{/isBasic}}
 {{#isOAuth}}- **Type**: OAuth
@@ -72,20 +72,20 @@ Example
 {{/scopes}}
 
 Example
-```
-	auth := context.WithValue(context.Background(), sw.ContextAccessToken, "ACCESSTOKENSTRING")
-    r, err := client.Service.Operation(auth, args)
+```golang
+auth := context.WithValue(context.Background(), sw.ContextAccessToken, "ACCESSTOKENSTRING")
+r, err := client.Service.Operation(auth, args)
 ```
 
 Or via OAuth2 module to automatically refresh tokens and perform user authentication.
-```
-	import 	"golang.org/x/oauth2"
+```golang
+import "golang.org/x/oauth2"
 
-    / .. Perform OAuth2 round trip request and obtain a token .. //
+/* Perform OAuth2 round trip request and obtain a token */
 
-    tokenSource := oauth2cfg.TokenSource(createContext(httpClient), &token)
-	auth := context.WithValue(oauth2.NoContext, sw.ContextOAuth2, tokenSource)
-    r, err := client.Service.Operation(auth, args)
+tokenSource := oauth2cfg.TokenSource(createContext(httpClient), &token)
+auth := context.WithValue(oauth2.NoContext, sw.ContextOAuth2, tokenSource)
+r, err := client.Service.Operation(auth, args)
 ```
 {{/isOAuth}}
 {{/authMethods}}
diff --git a/samples/client/petstore/go/go-petstore/README.md b/samples/client/petstore/go/go-petstore/README.md
index 7f58f0ccd5e..35dea62225e 100644
--- a/samples/client/petstore/go/go-petstore/README.md
+++ b/samples/client/petstore/go/go-petstore/README.md
@@ -11,8 +11,8 @@ This API client was generated by the [swagger-codegen](https://github.com/swagge
 
 ## Installation
 Put the package under your project folder and add the following in import:
-```
-    "./petstore"
+```golang
+import "./petstore"
 ```
 
 ## Documentation for API Endpoints
@@ -100,34 +100,34 @@ Class | Method | HTTP request | Description
 - **Type**: API key 
 
 Example
-```
-	auth := context.WithValue(context.Background(), sw.ContextAPIKey, sw.APIKey{
-		Key: "APIKEY",
-		Prefix: "Bearer", // Omit if not necessary.
-	})
-    r, err := client.Service.Operation(auth, args)
+```golang
+auth := context.WithValue(context.Background(), sw.ContextAPIKey, sw.APIKey{
+	Key: "APIKEY",
+	Prefix: "Bearer", // Omit if not necessary.
+})
+r, err := client.Service.Operation(auth, args)
 ```
 ## api_key_query
 - **Type**: API key 
 
 Example
-```
-	auth := context.WithValue(context.Background(), sw.ContextAPIKey, sw.APIKey{
-		Key: "APIKEY",
-		Prefix: "Bearer", // Omit if not necessary.
-	})
-    r, err := client.Service.Operation(auth, args)
+```golang
+auth := context.WithValue(context.Background(), sw.ContextAPIKey, sw.APIKey{
+	Key: "APIKEY",
+	Prefix: "Bearer", // Omit if not necessary.
+})
+r, err := client.Service.Operation(auth, args)
 ```
 ## http_basic_test
 - **Type**: HTTP basic authentication
 
 Example
-```
-	auth := context.WithValue(context.Background(), sw.ContextBasicAuth, sw.BasicAuth{
-		UserName: "username",
-		Password: "password",
-	})
-    r, err := client.Service.Operation(auth, args)
+```golang
+auth := context.WithValue(context.Background(), sw.ContextBasicAuth, sw.BasicAuth{
+	UserName: "username",
+	Password: "password",
+})
+r, err := client.Service.Operation(auth, args)
 ```
 ## petstore_auth
 - **Type**: OAuth
@@ -138,20 +138,20 @@ Example
  - **read:pets**: read your pets
 
 Example
-```
-	auth := context.WithValue(context.Background(), sw.ContextAccessToken, "ACCESSTOKENSTRING")
-    r, err := client.Service.Operation(auth, args)
+```golang
+auth := context.WithValue(context.Background(), sw.ContextAccessToken, "ACCESSTOKENSTRING")
+r, err := client.Service.Operation(auth, args)
 ```
 
 Or via OAuth2 module to automatically refresh tokens and perform user authentication.
-```
-	import 	"golang.org/x/oauth2"
+```golang
+import "golang.org/x/oauth2"
 
-    / .. Perform OAuth2 round trip request and obtain a token .. //
+/* Perform OAuth2 round trip request and obtain a token */
 
-    tokenSource := oauth2cfg.TokenSource(createContext(httpClient), &token)
-	auth := context.WithValue(oauth2.NoContext, sw.ContextOAuth2, tokenSource)
-    r, err := client.Service.Operation(auth, args)
+tokenSource := oauth2cfg.TokenSource(createContext(httpClient), &token)
+auth := context.WithValue(oauth2.NoContext, sw.ContextOAuth2, tokenSource)
+r, err := client.Service.Operation(auth, args)
 ```
 
 ## Author