diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..8bee94b69
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (c) 2018 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+#
+
+MK_DIR :=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+.PHONY: test test-release-tools
+
+test: test-release-tools
+
+test-release-tools:
+	@$(MK_DIR)/release/tag_repos_test.sh
diff --git a/release/tag_repos_test.sh b/release/tag_repos_test.sh
new file mode 100755
index 000000000..21afb2130
--- /dev/null
+++ b/release/tag_repos_test.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# Copyright (c) 2018 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+echo "Check tag_repos.sh show help"
+./release/tag_repos.sh  | grep Usage
+
+echo "Check tag_repos.sh -h option"
+./release/tag_repos.sh  -h | grep Usage
+
+echo "Check tag_repos.sh status"
+./release/tag_repos.sh status | grep runtime
+
+echo "Check tag_repos.sh create tags but not push"
+./release/tag_repos.sh tag | grep "tags not pushed"