diff --git a/tests/0_common/50_set_OS-version.sh b/tests/0_common/50_set_OS-version.sh
index d3cb71d..1c8452d 100755
--- a/tests/0_common/50_set_OS-version.sh
+++ b/tests/0_common/50_set_OS-version.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 # Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
-
 t_Log "Running $0 - Setting OS version to 5 or 6"
 
-OS_VERSION=$(t_DistCheck)
+centos_ver=$(t_DistCheck)
diff --git a/tests/p_git/0-install_git.sh b/tests/p_git/0-install_git.sh
index e6352cd..8d198ac 100755
--- a/tests/p_git/0-install_git.sh
+++ b/tests/p_git/0-install_git.sh
@@ -5,7 +5,7 @@
 t_Log "Running $0 - installing git"
 
 # Install git
-if [ $OS_VERSION -eq '6' ]
+if [ $centos_ver -eq '6' ]
   then
   t_InstallPackage git
 else
diff --git a/tests/p_git/10-test_git.sh b/tests/p_git/10-test_git.sh
index 66dfc37..9f26fd7 100755
--- a/tests/p_git/10-test_git.sh
+++ b/tests/p_git/10-test_git.sh
@@ -6,7 +6,7 @@
 
 t_Log "Running $0 - checking git installation"
 
-if [ $OS_VERSION -eq '6' ]
+if [ $centos_ver -eq '6' ]
   then
   git --version
   ret_val=$?
diff --git a/tests/p_git/11-test_git_clone.sh b/tests/p_git/11-test_git_clone.sh
index 117118f..a08a883 100755
--- a/tests/p_git/11-test_git_clone.sh
+++ b/tests/p_git/11-test_git_clone.sh
@@ -5,7 +5,7 @@
 
 t_Log "Running $0 - testing a local git clone operation"
 
-if [ $OS_VERSION -eq '6' ]
+if [ $centos_ver -eq '6' ]
   then
   # Testing Git clone by comparing SHAs
   workpath=$(pwd)
diff --git a/tests/p_git/12-test_git_log.sh b/tests/p_git/12-test_git_log.sh
index ff5504b..da8dd78 100755
--- a/tests/p_git/12-test_git_log.sh
+++ b/tests/p_git/12-test_git_log.sh
@@ -5,7 +5,7 @@
 
 t_Log "Running $0 - testing git logging and commit messages"
 
-if [ $OS_VERSION -eq '6' ]
+if [ $centos_ver -eq '6' ]
   then
   # Testing git log and git commit msgs
   workpath=$(pwd)