diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java
index 26ec7784c6..33eab5779b 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java
@@ -57,7 +57,7 @@ class JmsAnnotationDrivenConfiguration {
 			ConnectionFactory connectionFactory) {
 		DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory();
 		factory.setConnectionFactory(connectionFactory);
-		factory.setPubSubDomain(properties.isPubSubDomain());
+		factory.setPubSubDomain(this.properties.isPubSubDomain());
 		if (this.transactionManager != null) {
 			factory.setTransactionManager(this.transactionManager);
 		}
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java
index 09d2ff0606..64481f176a 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java
@@ -33,8 +33,8 @@ import org.springframework.jms.annotation.EnableJms;
 import org.springframework.jms.config.DefaultJmsListenerContainerFactory;
 import org.springframework.jms.config.JmsListenerConfigUtils;
 import org.springframework.jms.config.JmsListenerContainerFactory;
-import org.springframework.jms.config.SimpleJmsListenerContainerFactory;
 import org.springframework.jms.config.JmsListenerEndpoint;
+import org.springframework.jms.config.SimpleJmsListenerContainerFactory;
 import org.springframework.jms.core.JmsMessagingTemplate;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.listener.DefaultMessageListenerContainer;
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandException.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandException.java
index 8f77fdadd1..b5d36a09f4 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandException.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandException.java
@@ -62,6 +62,16 @@ public class CommandException extends RuntimeException {
 		this.options = asEnumSet(options);
 	}
 
+	/**
+	 * Create a new {@link CommandException} with the specified options.
+	 * @param cause the underlying cause
+	 * @param options the exception options
+	 */
+	public CommandException(Throwable cause, Option... options) {
+		super(cause);
+		this.options = asEnumSet(options);
+	}
+
 	private EnumSet<Option> asEnumSet(Option[] options) {
 		if (options == null || options.length == 0) {
 			return EnumSet.noneOf(Option.class);
@@ -100,6 +110,7 @@ public class CommandException extends RuntimeException {
 		 * Re-throw the exception rather than dealing with it.
 		 */
 		RETHROW
+
 	}
 
 }
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestFailedException.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestFailedException.java
index 47d2265d77..1b925bf124 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestFailedException.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestFailedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 original authors
+ * Copyright 2012-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.boot.cli.command.test;
 
+import org.springframework.boot.cli.command.CommandException;
+
 /**
- * Thrown when tests fail to execute
+ * Thrown when tests fail to execute.
  *
  * @author Graeme Rocher
- * @since 1.2
+ * @since 1.2.0
  */
-public class TestFailedException extends RuntimeException {
-    public TestFailedException(Throwable cause) {
-        super(cause);
-    }
+public class TestFailedException extends CommandException {
+
+	public TestFailedException(Throwable cause) {
+		super(cause, Option.HIDE_MESSAGE);
+	}
+
 }
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java
index 758deeb72c..5146af1777 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java
@@ -17,18 +17,19 @@
 package org.springframework.boot.cli.command.test;
 
 import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.boot.cli.compiler.GroovyCompiler;
 import org.springframework.boot.groovy.DelegateTestRunner;
+import org.springframework.util.ReflectionUtils;
 
 /**
  * Compile and run groovy based tests.
  *
  * @author Phillip Webb
+ * @author Graeme Rocher
  */
 public class TestRunner {
 
@@ -63,17 +64,16 @@ public class TestRunner {
 		runThread.start();
 		runThread.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
 			@Override
-			public void uncaughtException(Thread t, Throwable e) {
-				// rethrow exception
-				threadException = e;
+			public void uncaughtException(Thread t, Throwable ex) {
+				TestRunner.this.threadException = ex;
 			}
 		});
 
 		runThread.join();
-		if(threadException != null) {
-			Throwable t = threadException;
-			threadException = null;
-			throw new TestFailedException(t);
+		if (this.threadException != null) {
+			TestFailedException ex = new TestFailedException(this.threadException);
+			this.threadException = null;
+			throw ex;
 		}
 	}
 
@@ -150,30 +150,22 @@ public class TestRunner {
 					ClassLoader contextClassLoader = Thread.currentThread()
 							.getContextClassLoader();
 					Class<?> delegateClass = contextClassLoader
-												.loadClass(DelegateTestRunner.class.getName());
-					Class resultClass = contextClassLoader.loadClass("org.junit.runner.Result");
-					Method runMethod = delegateClass.getMethod("run", Class[].class, resultClass);
+							.loadClass(DelegateTestRunner.class.getName());
+					Class<?> resultClass = contextClassLoader
+							.loadClass("org.junit.runner.Result");
+					Method runMethod = delegateClass.getMethod("run", Class[].class,
+							resultClass);
 					Object result = resultClass.newInstance();
 					runMethod.invoke(null, this.testClasses, result);
-					Boolean wasSuccessful = (Boolean)resultClass.getMethod("wasSuccessful").invoke(result);
-					if(!wasSuccessful) {
-						try {
-							throw new RuntimeException("Tests Failed.");
-						} catch (Throwable throwable) {
-							throw new RuntimeException(throwable);
-						}
+					boolean wasSuccessful = (Boolean) resultClass.getMethod(
+							"wasSuccessful").invoke(result);
+					if (!wasSuccessful) {
+						throw new RuntimeException("Tests Failed.");
 					}
 				}
-			} catch (ClassNotFoundException e) {
-				throw new RuntimeException("Exception occurred running tests: " + e.getMessage(), e);
-			} catch (NoSuchMethodException e) {
-				throw new RuntimeException("Exception occurred running tests: " + e.getMessage(), e);
-			} catch (InstantiationException e) {
-				throw new RuntimeException("Exception occurred running tests: " + e.getMessage(), e);
-			} catch (IllegalAccessException e) {
-				throw new RuntimeException("Exception occurred running tests: " + e.getMessage(), e);
-			} catch (InvocationTargetException e) {
-				throw new RuntimeException("Exception occurred running tests: " + e.getMessage(), e);
+			}
+			catch (Exception ex) {
+				ReflectionUtils.rethrowRuntimeException(ex);
 			}
 		}
 	}
diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java
index 046689d71b..d41dd74043 100644
--- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java
+++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java
@@ -81,7 +81,7 @@ public class CliTester implements TestRule {
 		try {
 			this.commands.add(future.get(this.timeout, TimeUnit.MILLISECONDS));
 			return getOutput();
-		} catch (Exception e) {
+		} catch (Exception ex) {
 			return getOutput();
 		}
 	}
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java
index 2348de8762..313043e379 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java
@@ -26,7 +26,8 @@ package org.springframework.boot.context.embedded;
 public class Ssl {
 
 	/**
-	 * Whether client authentication is wanted ("want") or needed ("need"). Requires a trust store.
+	 * Whether client authentication is wanted ("want") or needed ("need"). Requires a
+	 * trust store.
 	 */
 	private ClientAuth clientAuth;