diff --git a/src/main/shell/run-sonar.sh b/src/main/shell/run-sonar.sh
index c2df8ed3..fe8d2d16 100755
--- a/src/main/shell/run-sonar.sh
+++ b/src/main/shell/run-sonar.sh
@@ -123,16 +123,21 @@ function runCommand() {
 ## COMMAND LINE OPTIONS
 vflag=""
 nflag=""
+unittests="on"
 oclint="on"
 fauxpas="on"
 lizard="on"
+sonarscanner=""
+
 while [ $# -gt 0 ]
 do
     case "$1" in
     -v)	vflag=on;;
     -n) nflag=on;;
-	-nooclint) oclint="";;
+    -nounittests) unittests="";;
+    -nooclint) oclint="";;
     -nofauxpas) fauxpas="";;
+    -usesonarscanner) sonarscanner="on";;
 	--)	shift; break;;
 	-*)
         echo >&2 "Usage: $0 [-v]"
@@ -248,8 +253,8 @@ oclint-xcodebuild # Transform the xcodebuild.log file into a compile_command.jso
 
 
 # Unit tests and coverage
-if [ "$testScheme" = "" ]; then
-	echo 'Skipping tests as no test scheme has been provided!'
+if [ "$testScheme" = "" ] || [ "$unittests" = "" ]; then
+	echo 'Skipping tests!'
 
 	# Put default xml files with no tests and no coverage...
 	echo "<?xml version='1.0' encoding='UTF-8' standalone='yes'?><testsuites name='AllTestUnits'></testsuites>" > sonar-reports/TEST-report.xml
@@ -430,8 +435,21 @@ else
 fi
 
 # SonarQube
-echo -n 'Running SonarQube using SonarQube Runner'
-runCommand /dev/stdout sonar-runner
+if [ "$sonarscanner" = "on" ]; then
+    echo -n 'Running SonarQube using SonarQube Scanner'
+    if hash /dev/stdout sonar-scanner 2>/dev/null; then
+        runCommand /dev/stdout sonar-scanner
+    else
+        echo 'Skipping sonar-scanner (not installed!)'
+    fi
+else
+    echo -n 'Running SonarQube using SonarQube Runner'
+    if hash /dev/stdout sonar-runner 2>/dev/null; then
+        runCommand /dev/stdout sonar-runner 
+    else
+        runCommand /dev/stdout sonar-scanner
+    fi
+fi
 
 # Kill progress indicator
 stopProgress