diff --git a/git_hooks/README.md b/test/git-scripts/README.md
similarity index 62%
rename from git_hooks/README.md
rename to test/git-scripts/README.md
index 400d63ee5..6bd9110c5 100644
--- a/git_hooks/README.md
+++ b/test/git-scripts/README.md
@@ -4,11 +4,13 @@ git has a way to run scripts, which are invoked by specific git commands.
 The git hooks are located in `<mbed TLS root>/.git/hooks`, and as such are not under version control
 for more information, see the [git documentation](https://git-scm.com/docs/githooks).
 
-The mbed TLS git hooks are located in `<mbed TLS root>/git_hooks` directory, and one must create a soft link from `<mbed TLS root>/.git/hooks` to `<mbed TLS root>/git_hooks`, in order to make the hook scripts successfully work.
+The mbed TLS git hooks are located in `<mbed TLS root>/test/git-scripts` directory, and one must create a soft link from `<mbed TLS root>/.git/hooks` to `<mbed TLS root>/test/git-scripts`, in order to make the hook scripts successfully work.
 
 Example:
 
 Execute the following command to create a link on linux from the mbed TLS `.git/hooks` directory:  
-`ln -s ../../git_hooks/pre-push pre-push`
+`ln -s ../../test/git-scripts/pre-push.sh pre-push`
 
 **Note: Currently the mbed TLS git hooks work only on a GNU platform. If using a non-GNU platform, don't enable these hooks!**
+
+These scripts can also be used independently.
diff --git a/git_hooks/pre-push b/test/git-scripts/pre-push.sh
similarity index 82%
rename from git_hooks/pre-push
rename to test/git-scripts/pre-push.sh
index 6b2da10ed..ee54a6cff 100755
--- a/git_hooks/pre-push
+++ b/test/git-scripts/pre-push.sh
@@ -1,7 +1,15 @@
 #!/bin/sh
-
+# pre-push.sh
+#
+# This file is part of mbed TLS (https://tls.mbed.org)
+#
+# Copyright (c) 2017, ARM Limited, All Rights Reserved
+#
+# Purpose
+#
 # Called by "git push" after it has checked the remote status, but before anything has been
 # pushed.  If this script exits with a non-zero status nothing will be pushed.
+# This script can also be used independently, not using git.
 #
 # This hook is called with the following parameters:
 #
@@ -15,7 +23,6 @@
 #
 #   <local ref> <local sha1> <remote ref> <remote sha1>
 #
-set -eu
 
 REMOTE="$1"
 URL="$2"
@@ -23,6 +30,8 @@ URL="$2"
 echo "REMOTE is $REMOTE"
 echo "URL is $URL"
 
+set -eu
+
 run_test()
 {
     TEST=$1