diff --git a/exercises/client-args.sh b/exercises/client-args.sh
index 9cbb6a6635..b3e2ad8d4a 100755
--- a/exercises/client-args.sh
+++ b/exercises/client-args.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-**client-args.sh**
+# **client-args.sh**
 
 # Test OpenStack client authentication aguemnts handling
 
@@ -140,8 +140,10 @@ report "Nova" $STATUS_NOVA
 report "Glance" $STATUS_GLANCE
 report "Swift" $STATUS_SWIFT
 
-echo "*********************************************************************"
-echo "SUCCESS: End DevStack Exercise: $0"
-echo "*********************************************************************"
+if (( $RETURN == 0 )); then
+    echo "*********************************************************************"
+    echo "SUCCESS: End DevStack Exercise: $0"
+    echo "*********************************************************************"
+fi
 
 exit $RETURN
diff --git a/exercises/client-env.sh b/exercises/client-env.sh
index 94f4a82c88..68c0e5adce 100755
--- a/exercises/client-env.sh
+++ b/exercises/client-env.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-**client-env.sh**
+# **client-env.sh**
 
 # Test OpenStack client enviroment variable handling
 
@@ -149,8 +149,10 @@ report "EC2" $STATUS_EC2
 report "Glance" $STATUS_GLANCE
 report "Swift" $STATUS_SWIFT
 
-echo "*********************************************************************"
-echo "SUCCESS: End DevStack Exercise: $0"
-echo "*********************************************************************"
+if (( $RETURN == 0 )); then
+    echo "*********************************************************************"
+    echo "SUCCESS: End DevStack Exercise: $0"
+    echo "*********************************************************************"
+fi
 
 exit $RETURN