diff --git a/tests/c++-compiler/test.sh b/tests/c++-compiler/test.sh
index 35171a9..3a78fdd 100755
--- a/tests/c++-compiler/test.sh
+++ b/tests/c++-compiler/test.sh
@@ -6,11 +6,11 @@
 # Chrsitoph Niethammer <niethammer@hlrs.de> (C) 2011 
 #
 
-compilers="pgi gcc cray"
+compilers="pgi gcc cray intel"
 
 compiler_version_cmd() {
     case $1 in
-        cray|gcc)
+        cray|gcc|intel)
             cmd="CC --version"
         ;;
         pgi)
@@ -39,11 +39,8 @@ swap_env() {
     module swap $currentPrgEnv PrgEnv-$newPrgEnv
 }
 
-
-pwd
-
 for compiler in $compilers; do
-    for version in $(module av $compiler -l 2>&1 | awk "/^$compiler/{print \$1}" | awk -F'/' '{print $2}'); do 
+    for version in $(module av $compiler -l 2>&1 | awk "/^$compiler\//{print \$1}" | awk -F'/' '{print $2}'); do 
         logfile="$compiler-$version.log"
         echo -en "testing $compiler/$version ... "
         error=0