diff --git a/dockerfiles/e2e/docker-entrypoint.sh b/dockerfiles/e2e/docker-entrypoint.sh
index 1450d0b8981..6b4e778f909 100755
--- a/dockerfiles/e2e/docker-entrypoint.sh
+++ b/dockerfiles/e2e/docker-entrypoint.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
+# Copyright (c) 2019 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
 
-if [ -z $TS_SELENIUM_BASE_URL ]; then
+if [ -z "$TS_SELENIUM_BASE_URL" ]; then
     echo "TS_SELENIUM_BASE_URL is not set!";
     exit 1
 fi
@@ -15,11 +20,11 @@ echo "You can watch locally using VNC with IP: $hostname"
 
 if mount | grep 'local_tests'; then
 	echo "The local code is mounted. Executing local code."
-	cd local_tests
+	cd local_tests || exit
 	npm i
 else
 	echo "Executing e2e tests from an image."
-	cd e2e
+	cd e2e || exit
 fi
 
 npm run test
diff --git a/dockerfiles/e2e/google-chrome.repo b/dockerfiles/e2e/google-chrome.repo
index 7045b11c327..3103e30c71d 100644
--- a/dockerfiles/e2e/google-chrome.repo
+++ b/dockerfiles/e2e/google-chrome.repo
@@ -3,4 +3,4 @@ name=google-chrome
 baseurl=http://dl.google.com/linux/chrome/rpm/stable/$basearch
 enabled=1
 gpgcheck=1
-gpgkey=https://dl-ssl.google.com/linux/linux_signing_key.pub
\ No newline at end of file
+gpgkey=https://dl-ssl.google.com/linux/linux_signing_key.pub