diff --git a/Makefile b/Makefile
index ae067d2e932..f7dff07bec4 100644
--- a/Makefile
+++ b/Makefile
@@ -48,14 +48,15 @@ gen-endpoints:
 build:
 	@echo "go build SDK and vendor packages"
 	@go build ${SDK_ONLY_PKGS}
+	@go build -tags example ./example/...
 
 unit: get-deps-tests build verify
 	@echo "go test SDK and vendor packages"
-	@go test -tags $(SDK_ONLY_PKGS)
+	@go test $(SDK_ONLY_PKGS)
 
 unit-with-race-cover: get-deps-tests build verify
 	@echo "go test SDK and vendor packages"
-	@go test -tags -race -cpu=1,2,4 $(SDK_ONLY_PKGS)
+	@go test -race -cpu=1,2,4 $(SDK_ONLY_PKGS)
 
 integration: get-deps-tests integ-custom smoke-tests performance
 
diff --git a/awsmigrate/awsmigrate-renamer/gen/gen.go b/awsmigrate/awsmigrate-renamer/gen/gen.go
index 0dc65294238..286d4bfd7a6 100644
--- a/awsmigrate/awsmigrate-renamer/gen/gen.go
+++ b/awsmigrate/awsmigrate-renamer/gen/gen.go
@@ -1,4 +1,4 @@
-// +build go1.5
+// +build go1.5,deprecated
 
 package main
 
diff --git a/awsmigrate/awsmigrate-renamer/rename/rename.go b/awsmigrate/awsmigrate-renamer/rename/rename.go
index 05d6f36265f..234ae7ce675 100644
--- a/awsmigrate/awsmigrate-renamer/rename/rename.go
+++ b/awsmigrate/awsmigrate-renamer/rename/rename.go
@@ -1,4 +1,4 @@
-// +build go1.5
+// +build go1.5,deprecated
 
 package rename
 
diff --git a/awsmigrate/awsmigrate-renamer/rename/renames.go b/awsmigrate/awsmigrate-renamer/rename/renames.go
index 0d22f39ec9a..55c7b4e676a 100644
--- a/awsmigrate/awsmigrate-renamer/rename/renames.go
+++ b/awsmigrate/awsmigrate-renamer/rename/renames.go
@@ -1,4 +1,4 @@
-// +build go1.5
+// +build go1.5,deprecated
 
 package rename
 
diff --git a/awsmigrate/awsmigrate-renamer/renamer.go b/awsmigrate/awsmigrate-renamer/renamer.go
index ed60e88dd08..df5c5e89b1f 100644
--- a/awsmigrate/awsmigrate-renamer/renamer.go
+++ b/awsmigrate/awsmigrate-renamer/renamer.go
@@ -1,4 +1,4 @@
-// +build go1.5
+// +build go1.5,deprecated
 
 package main
 
diff --git a/example/aws/request/handleServiceErrorCodes/handleServiceErrorCodes.go b/example/aws/request/handleServiceErrorCodes/handleServiceErrorCodes.go
index 3fc306ac97b..1e36634cb6f 100644
--- a/example/aws/request/handleServiceErrorCodes/handleServiceErrorCodes.go
+++ b/example/aws/request/handleServiceErrorCodes/handleServiceErrorCodes.go
@@ -1,3 +1,5 @@
+// +build example
+
 package main
 
 import (
diff --git a/example/service/cloudfront/signCookies/signCookies.go b/example/service/cloudfront/signCookies/signCookies.go
index e476869dd62..b16545aaff6 100644
--- a/example/service/cloudfront/signCookies/signCookies.go
+++ b/example/service/cloudfront/signCookies/signCookies.go
@@ -1,3 +1,5 @@
+// +build example
+
 package main
 
 import (
diff --git a/example/service/ec2/filterInstances/filter_ec2_by_tag.go b/example/service/ec2/filterInstances/filter_ec2_by_tag.go
index a5c3c7e9f22..c85fce607b0 100644
--- a/example/service/ec2/filterInstances/filter_ec2_by_tag.go
+++ b/example/service/ec2/filterInstances/filter_ec2_by_tag.go
@@ -1,3 +1,5 @@
+// +build example
+
 package main
 
 import (
diff --git a/example/service/s3/concatObjects/concatObjects.go b/example/service/s3/concatObjects/concatObjects.go
index 1ca9cca5e8b..5c598263670 100644
--- a/example/service/s3/concatObjects/concatObjects.go
+++ b/example/service/s3/concatObjects/concatObjects.go
@@ -1,3 +1,5 @@
+// +build example
+
 package main
 
 import (
diff --git a/example/service/s3/listObjects/listObjects.go b/example/service/s3/listObjects/listObjects.go
index 57ceb049ffb..ac37bdf1118 100644
--- a/example/service/s3/listObjects/listObjects.go
+++ b/example/service/s3/listObjects/listObjects.go
@@ -1,3 +1,5 @@
+// +build example
+
 package main
 
 import (
diff --git a/example/service/s3/listObjectsConcurrently/listObjectsConcurrently.go b/example/service/s3/listObjectsConcurrently/listObjectsConcurrently.go
index 2f4cdf5da4b..4e031cfaefd 100644
--- a/example/service/s3/listObjectsConcurrently/listObjectsConcurrently.go
+++ b/example/service/s3/listObjectsConcurrently/listObjectsConcurrently.go
@@ -1,3 +1,5 @@
+// +build example
+
 package main
 
 import (
diff --git a/models/protocol_tests/generate.go b/models/protocol_tests/generate.go
index 56630309545..18aba31024f 100644
--- a/models/protocol_tests/generate.go
+++ b/models/protocol_tests/generate.go
@@ -1,3 +1,5 @@
+// +build codegen
+
 package main
 
 import (
diff --git a/private/model/cli/api-info/api-info.go b/private/model/cli/api-info/api-info.go
index 44faa262eb1..ee2b66d6492 100644
--- a/private/model/cli/api-info/api-info.go
+++ b/private/model/cli/api-info/api-info.go
@@ -1,3 +1,5 @@
+// +build codegen
+
 package main
 
 import (
diff --git a/private/model/cli/gen-api/main.go b/private/model/cli/gen-api/main.go
index 7b2a21a0416..668ad278cd3 100644
--- a/private/model/cli/gen-api/main.go
+++ b/private/model/cli/gen-api/main.go
@@ -1,3 +1,5 @@
+// +build codegen
+
 // Command aws-gen-gocli parses a JSON description of an AWS API and generates a
 // Go file containing a client for the API.
 //
diff --git a/private/model/cli/gen-endpoints/main.go b/private/model/cli/gen-endpoints/main.go
index 971e989a49f..d6655fcf58e 100644
--- a/private/model/cli/gen-endpoints/main.go
+++ b/private/model/cli/gen-endpoints/main.go
@@ -1,3 +1,5 @@
+// +build codegen
+
 // Command aws-gen-goendpoints parses a JSON description of the AWS endpoint
 // discovery logic and generates a Go file which returns an endpoint.
 //