diff --git a/scripts/git-tag.sh b/scripts/git-tag.sh
index ceff317..7d92371 100755
--- a/scripts/git-tag.sh
+++ b/scripts/git-tag.sh
@@ -3,6 +3,12 @@
 CURRENT_VERSION=$(grep -E "^version\s?=" Cargo.toml | cut --delimiter='"' --fields=2)
 TAG="v$CURRENT_VERSION"
 
+cargo fmt
+
+if ! cargo test; then
+	exit $?
+fi
+
 if cargo publish --dry-run; then
 	echo "Creating tag: $TAG"
 	echo "Do not forget to push it: git push origin $TAG"