diff --git a/Makefile b/Makefile
index 0fb93e37..801f1d4d 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ test:
 	make test-nodocker
 
 test-examples:
-	$(foreach f,$(shell ls examples/*),go build -o /dev/null $(f)$(NL))
+	go build -o /dev/null ./examples/...
 
 test-pkg:
 	go test -race -v ./pkg/...
diff --git a/README.md b/README.md
index 6c3739fc..71fd27d2 100644
--- a/README.md
+++ b/README.md
@@ -30,17 +30,17 @@ Features:
 
 ## Examples
 
-* [client-query](examples/client-query.go)
-* [client-read](examples/client-read.go)
-* [client-read-partial](examples/client-read-partial.go)
-* [client-read-options](examples/client-read-options.go)
-* [client-read-pause](examples/client-read-pause.go)
-* [client-publish](examples/client-publish.go)
-* [client-publish-options](examples/client-publish-options.go)
-* [client-publish-pause](examples/client-publish-pause.go)
-* [server](examples/server.go)
-* [server-udp](examples/server-udp.go)
-* [server-tls](examples/server-tls.go)
+* [client-query](examples/client-query/main.go)
+* [client-read](examples/client-read/main.go)
+* [client-read-partial](examples/client-read-partial/main.go)
+* [client-read-options](examples/client-read-options/main.go)
+* [client-read-pause](examples/client-read-pause/main.go)
+* [client-publish](examples/client-publish/main.go)
+* [client-publish-options](examples/client-publish-options/main.go)
+* [client-publish-pause](examples/client-publish-pause/main.go)
+* [server](examples/server/main.go)
+* [server-udp](examples/server-udp/main.go)
+* [server-tls](examples/server-tls/main.go)
 
 ## API Documentation
 
diff --git a/examples/client-publish-options.go b/examples/client-publish-options/main.go
similarity index 99%
rename from examples/client-publish-options.go
rename to examples/client-publish-options/main.go
index cb0974bc..810d98c7 100644
--- a/examples/client-publish-options.go
+++ b/examples/client-publish-options/main.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package main
 
 import (
diff --git a/examples/client-publish-pause.go b/examples/client-publish-pause/main.go
similarity index 99%
rename from examples/client-publish-pause.go
rename to examples/client-publish-pause/main.go
index b9d5e0f5..ddb6c2a2 100644
--- a/examples/client-publish-pause.go
+++ b/examples/client-publish-pause/main.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package main
 
 import (
diff --git a/examples/client-publish.go b/examples/client-publish/main.go
similarity index 98%
rename from examples/client-publish.go
rename to examples/client-publish/main.go
index c5df4774..041eb7a5 100644
--- a/examples/client-publish.go
+++ b/examples/client-publish/main.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package main
 
 import (
diff --git a/examples/client-query.go b/examples/client-query/main.go
similarity index 97%
rename from examples/client-query.go
rename to examples/client-query/main.go
index 0423967a..9982667d 100644
--- a/examples/client-query.go
+++ b/examples/client-query/main.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package main
 
 import (
diff --git a/examples/client-read-options.go b/examples/client-read-options/main.go
similarity index 98%
rename from examples/client-read-options.go
rename to examples/client-read-options/main.go
index db7ae97a..46ace7c9 100644
--- a/examples/client-read-options.go
+++ b/examples/client-read-options/main.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package main
 
 import (
diff --git a/examples/client-read-partial.go b/examples/client-read-partial/main.go
similarity index 98%
rename from examples/client-read-partial.go
rename to examples/client-read-partial/main.go
index 8eb1a638..d87ce360 100644
--- a/examples/client-read-partial.go
+++ b/examples/client-read-partial/main.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package main
 
 import (
diff --git a/examples/client-read-pause.go b/examples/client-read-pause/main.go
similarity index 97%
rename from examples/client-read-pause.go
rename to examples/client-read-pause/main.go
index 448ecd06..6624ccb7 100644
--- a/examples/client-read-pause.go
+++ b/examples/client-read-pause/main.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package main
 
 import (
diff --git a/examples/client-read.go b/examples/client-read/main.go
similarity index 96%
rename from examples/client-read.go
rename to examples/client-read/main.go
index 4132fb25..41d95235 100644
--- a/examples/client-read.go
+++ b/examples/client-read/main.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package main
 
 import (
diff --git a/examples/server-tls.go b/examples/server-tls/main.go
similarity index 99%
rename from examples/server-tls.go
rename to examples/server-tls/main.go
index 1ddb0418..db672d2f 100644
--- a/examples/server-tls.go
+++ b/examples/server-tls/main.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package main
 
 import (
diff --git a/examples/server-udp.go b/examples/server-udp/main.go
similarity index 99%
rename from examples/server-udp.go
rename to examples/server-udp/main.go
index 4dd2440b..466f347e 100644
--- a/examples/server-udp.go
+++ b/examples/server-udp/main.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package main
 
 import (
diff --git a/examples/server.go b/examples/server/main.go
similarity index 99%
rename from examples/server.go
rename to examples/server/main.go
index 82c99a6f..318903a1 100644
--- a/examples/server.go
+++ b/examples/server/main.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package main
 
 import (