diff --git a/Dockerfile b/Dockerfile
index a55bbdd..f4749d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   zlib1g-dev \
   libssl-dev \
   libreadline-dev \
-  unzip
+  unzip \
+  ssh
 
 ## Clean dependencies
 RUN apt-get clean
diff --git a/ci_cd.sh b/ci_cd.sh
index 9083379..4d24b24 100755
--- a/ci_cd.sh
+++ b/ci_cd.sh
@@ -110,7 +110,7 @@ fi
 if [ "$test" = true ]; then
     tasks=$((tasks+1))
     echo "Testing image $full_image_name"
-    test_options="--android-api $android_api --android-build-tools $android_build_tools"
+    test_options="--check-base-tools --android-api $android_api --android-build-tools $android_build_tools"
     if [ "$android_ndk" = true ]; then
         test_options="$test_options --android-ndk"
     fi
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index c609045..c739e33 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -12,8 +12,9 @@ usage() {
     echo " --android-ndk Test with NDK application"
     echo " --android-api Tests apps compile and target SDK"
     echo " --gcloud Tests if gcloud SDK was installed"
+    echo " --check-base-tools Test base tools setup like Java, Ruby and other"
     echo " --android-build-tools Used android builds tools"
-    echo "  --large-test Run large tests on the image (Firebase Test Lab for example)"
+    echo " --large-test Run large tests on the image (Firebase Test Lab for example)"
     exit 1
 }
 
@@ -26,6 +27,7 @@ while true; do
   case "$1" in
     --android-ndk ) android_ndk=true; shift ;;
     --gcloud ) gcloud=true; shift ;;
+    --check-base-tools ) check_base_tools=true; shift ;;
     --android-api ) android_api=$2; shift 2 ;;
     --android-build-tools ) android_build_tools=$2; shift 2 ;;
     --large-test ) large_test=true; shift ;;
@@ -41,10 +43,13 @@ if [ -z "$android_build_tools" ]; then
   usage
 fi
 
-java -version
-rbenv -v
+if [ "$check_base_tools" = true ]; then
+  java -version
+  rbenv -v
+  ssh -V
+fi
 
-if [[ "$gcloud" = true ]]; then
+if [ "$gcloud" = true ]; then
   # Check if gcloud sdk is installed
   gcloud --version
 fi