diff --git a/coverage.sh b/coverage.sh
index 3a25c7154..4b9793d95 100755
--- a/coverage.sh
+++ b/coverage.sh
@@ -15,6 +15,5 @@
 #
 
 MEMBER_COUNT=3
-TEST_FLAGS="-v -count 1 -tags=hazelcastinternal -timeout 20m"
-PACKAGES=$(go list ./... | grep -v org-website | grep -v /internal/it | grep -v /benchmarks | grep -v /stress_tests | grep -v /soak_tests | grep -v /examples | grep -v /cmd)
-env MEMBER_COUNT=${MEMBER_COUNT} go test ${TEST_FLAGS} -count=1 -coverpkg $(${PACKAGES} | tr "\n" ",") -coverprofile=coverage.out ${PACKAGES}
+TEST_FLAGS=
+env MEMBER_COUNT=${MEMBER_COUNT} go test ${TEST_FLAGS} -count=1 -coverpkg "$(go list ./... | grep -v /internal/it | grep -v /benchmarks | grep -v /stress_tests | grep -v /soak_tests | grep -v /examples | grep -v /cmd | tr "\n" ",")" -coverprofile=coverage.out ./...
\ No newline at end of file
diff --git a/examples/org-website/custom_serializer_sample.go b/examples/org-website/custom_serializer_sample.go
index 0512198d0..bb1fbcbac 100644
--- a/examples/org-website/custom_serializer_sample.go
+++ b/examples/org-website/custom_serializer_sample.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package main
 
 import (
diff --git a/examples/org-website/list_sample.go b/examples/org-website/list_sample.go
index f57f95cf0..987974942 100644
--- a/examples/org-website/list_sample.go
+++ b/examples/org-website/list_sample.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package main
 
 import (
diff --git a/examples/org-website/map_sample.go b/examples/org-website/map_sample.go
index a874c4dea..f1aa8903b 100644
--- a/examples/org-website/map_sample.go
+++ b/examples/org-website/map_sample.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package main
 
 import (
diff --git a/examples/org-website/portable_serializable_sample.go b/examples/org-website/portable_serializable_sample.go
index ca1a1d0ff..7d5dce9d3 100644
--- a/examples/org-website/portable_serializable_sample.go
+++ b/examples/org-website/portable_serializable_sample.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package main
 
 import (
diff --git a/examples/org-website/query_sample.go b/examples/org-website/query_sample.go
index 36e4353ae..6ba7d8109 100644
--- a/examples/org-website/query_sample.go
+++ b/examples/org-website/query_sample.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package main
 
 import (
diff --git a/examples/org-website/queue_sample.go b/examples/org-website/queue_sample.go
index 6bca69ee8..de6833cf5 100644
--- a/examples/org-website/queue_sample.go
+++ b/examples/org-website/queue_sample.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package main
 
 import (
diff --git a/examples/org-website/replicated_map_sample.go b/examples/org-website/replicated_map_sample.go
index 29e6f7fc4..55c56135e 100644
--- a/examples/org-website/replicated_map_sample.go
+++ b/examples/org-website/replicated_map_sample.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package main
 
 import (
diff --git a/examples/org-website/set_sample.go b/examples/org-website/set_sample.go
index 826544d0b..b20650851 100644
--- a/examples/org-website/set_sample.go
+++ b/examples/org-website/set_sample.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package main
 
 import (
diff --git a/examples/org-website/topic_sample.go b/examples/org-website/topic_sample.go
index bd518d28f..f154556cc 100644
--- a/examples/org-website/topic_sample.go
+++ b/examples/org-website/topic_sample.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 package main
 
 import (