diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java
index e7f51f7846..e2cfd614e9 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java
@@ -239,7 +239,7 @@ public class CrshAutoConfiguration {
 			try {
 				token = this.authenticationManager.authenticate(token);
 			}
-			catch (AuthenticationException ae) {
+			catch (AuthenticationException ex) {
 				return false;
 			}
 
@@ -250,7 +250,7 @@ public class CrshAutoConfiguration {
 					this.accessDecisionManager.decide(token, this,
 							SecurityConfig.createList(this.roles));
 				}
-				catch (AccessDeniedException e) {
+				catch (AccessDeniedException ex) {
 					return false;
 				}
 			}
@@ -440,7 +440,7 @@ public class CrshAutoConfiguration {
 			try {
 				return this.resource.lastModified();
 			}
-			catch (IOException e) {
+			catch (IOException ex) {
 			}
 			return -1;
 		}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleHealthIndicator.java
index fcca0bd82d..fb3346f621 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleHealthIndicator.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleHealthIndicator.java
@@ -50,18 +50,18 @@ public class SimpleHealthIndicator implements HealthIndicator<Map<String, Object
 				map.put("database", this.dataSource.getConnection().getMetaData()
 						.getDatabaseProductName());
 			}
-			catch (SQLException e) {
+			catch (SQLException ex) {
 				map.put("status", "error");
-				map.put("error", e.getClass().getName() + ": " + e.getMessage());
+				map.put("error", ex.getClass().getName() + ": " + ex.getMessage());
 			}
 			if (StringUtils.hasText(this.query)) {
 				try {
 					map.put("hello",
 							this.jdbcTemplate.queryForObject(this.query, String.class));
 				}
-				catch (Exception e) {
+				catch (Exception ex) {
 					map.put("status", "error");
-					map.put("error", e.getClass().getName() + ": " + e.getMessage());
+					map.put("error", ex.getClass().getName() + ": " + ex.getMessage());
 				}
 			}
 		}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java
index 692a9073c6..3084882f04 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java
@@ -54,7 +54,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 /**
  * Tests for {@link CrshAutoConfiguration}.
@@ -235,7 +234,7 @@ public class CrshAutoConfigurationTests {
 	}
 
 	@Test
-	public void testSimpleAuthenticationProvider() {
+	public void testSimpleAuthenticationProvider() throws Exception {
 		MockEnvironment env = new MockEnvironment();
 		env.setProperty("shell.auth", "simple");
 		env.setProperty("shell.auth.simple.username", "user");
@@ -261,24 +260,13 @@ public class CrshAutoConfigurationTests {
 			}
 		}
 		assertNotNull(authenticationPlugin);
-		try {
-			assertTrue(authenticationPlugin.authenticate("user", "password"));
-		}
-		catch (Exception e) {
-			fail();
-		}
-
-		try {
-			assertFalse(authenticationPlugin.authenticate(UUID.randomUUID().toString(),
-					"password"));
-		}
-		catch (Exception e) {
-			fail();
-		}
+		assertTrue(authenticationPlugin.authenticate("user", "password"));
+		assertFalse(authenticationPlugin.authenticate(UUID.randomUUID().toString(),
+				"password"));
 	}
 
 	@Test
-	public void testSpringAuthenticationProvider() {
+	public void testSpringAuthenticationProvider() throws Exception {
 		MockEnvironment env = new MockEnvironment();
 		env.setProperty("shell.auth", "spring");
 		this.context = new AnnotationConfigWebApplicationContext();
@@ -300,22 +288,11 @@ public class CrshAutoConfigurationTests {
 				break;
 			}
 		}
-		assertNotNull(authenticationPlugin);
-		try {
-			assertTrue(authenticationPlugin.authenticate(SecurityConfiguration.USERNAME,
-					SecurityConfiguration.PASSWORD));
-		}
-		catch (Exception e) {
-			fail();
-		}
+		assertTrue(authenticationPlugin.authenticate(SecurityConfiguration.USERNAME,
+				SecurityConfiguration.PASSWORD));
 
-		try {
-			assertFalse(authenticationPlugin.authenticate(UUID.randomUUID().toString(),
-					SecurityConfiguration.PASSWORD));
-		}
-		catch (Exception e) {
-			fail();
-		}
+		assertFalse(authenticationPlugin.authenticate(UUID.randomUUID().toString(),
+				SecurityConfiguration.PASSWORD));
 	}
 
 	@Configuration
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
index d76f52896e..02ca19122e 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
@@ -197,7 +197,8 @@ public class WebMvcAutoConfiguration {
 						logger.info("Adding welcome page: "
 								+ this.resourceLoader.getResource(resource).getURL());
 					}
-					catch (IOException e) {
+					catch (IOException ex) {
+						// Ignore
 					}
 					registry.addViewController("/").setViewName("/index.html");
 					return;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoconfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoconfigurationTests.java
index 68bf9803d5..b6a0ce029a 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoconfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoconfigurationTests.java
@@ -16,12 +16,15 @@
 
 package org.springframework.boot.autoconfigure.amqp;
 
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.springframework.amqp.core.AmqpAdmin;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.boot.TestUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -29,7 +32,6 @@ import org.springframework.context.annotation.Configuration;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
 
 /**
  * Tests for {@link RabbitAutoConfiguration}.
@@ -40,6 +42,9 @@ public class RabbitAutoconfigurationTests {
 
 	private AnnotationConfigApplicationContext context;
 
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
 	@Test
 	public void testDefaultRabbitTemplate() {
 		this.context = new AnnotationConfigApplicationContext();
@@ -123,12 +128,11 @@ public class RabbitAutoconfigurationTests {
 		this.context.register(TestConfiguration.class, RabbitAutoConfiguration.class);
 		TestUtils.addEnviroment(this.context, "spring.rabbitmq.dynamic:false");
 		this.context.refresh();
-		try {
-			this.context.getBean(AmqpAdmin.class);
-			fail("There should NOT be an AmqpAdmin bean when dynamic is switch to false");
-		}
-		catch (Exception e) {
-		}
+		// There should NOT be an AmqpAdmin bean when dynamic is switch to false
+		this.thrown.expect(NoSuchBeanDefinitionException.class);
+		this.thrown.expectMessage("No qualifying bean of type "
+				+ "[org.springframework.amqp.core.AmqpAdmin] is defined");
+		this.context.getBean(AmqpAdmin.class);
 	}
 
 	@Configuration
diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/UnsecureManagementSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/UnsecureManagementSampleActuatorApplicationTests.java
index 3e6082a339..1d100914c0 100644
--- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/UnsecureManagementSampleActuatorApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/UnsecureManagementSampleActuatorApplicationTests.java
@@ -41,7 +41,7 @@ import org.springframework.web.client.RestTemplate;
 /**
  * Integration tests for unsecured service endpoints (even with Spring Security on
  * classpath).
- * 
+ *
  * @author Dave Syer
  */
 public class UnsecureManagementSampleActuatorApplicationTests {
@@ -87,7 +87,7 @@ public class UnsecureManagementSampleActuatorApplicationTests {
 	public void testMetrics() throws Exception {
 		try {
 			testHomeIsSecure(); // makes sure some requests have been made
-		} catch (AssertionError e) {
+		} catch (AssertionError ex) {
 			// ignore;
 		}
 		@SuppressWarnings("rawtypes")
diff --git a/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/org/springframework/boot/sample/data/mongo/SampleMongoApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/org/springframework/boot/sample/data/mongo/SampleMongoApplicationTests.java
index 2963fc212e..81db13d43e 100644
--- a/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/org/springframework/boot/sample/data/mongo/SampleMongoApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/org/springframework/boot/sample/data/mongo/SampleMongoApplicationTests.java
@@ -39,8 +39,8 @@ public class SampleMongoApplicationTests {
 	public void testDefaultSettings() throws Exception {
 		try {
 			SampleMongoApplication.main(new String[0]);
-		} catch (IllegalStateException e) {
-			if (serverNotRunning(e)) {
+		} catch (IllegalStateException ex) {
+			if (serverNotRunning(ex)) {
 				return;
 			}
 		}
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeTimer.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeTimer.java
index ace9bd67c8..8d4c2854a9 100644
--- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeTimer.java
+++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeTimer.java
@@ -94,8 +94,8 @@ public class SnakeTimer {
 				try {
 					tick();
 				}
-				catch (Throwable e) {
-					log.error("Caught to prevent timer from shutting down", e);
+				catch (Throwable ex) {
+					log.error("Caught to prevent timer from shutting down", ex);
 				}
 			}
 		}, TICK_DELAY, TICK_DELAY);
diff --git a/spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java b/spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java
index 35d895febb..c77046af9b 100644
--- a/spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java
+++ b/spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java
@@ -60,8 +60,8 @@ public class WebApplicationInitializersConfiguration extends AbstractConfigurati
 						initializer.onStartup(sce.getServletContext());
 					}
 				}
-				catch (Exception e) {
-					throw new RuntimeException(e);
+				catch (Exception ex) {
+					throw new RuntimeException(ex);
 				}
 			}
 
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java
index adf964d494..e0e9f56519 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java
@@ -173,14 +173,16 @@ public class LaunchedURLClassLoader extends URLClassLoader {
 
 							}
 						}
-						catch (IOException e) {
+						catch (IOException ex) {
+							// Ignore
 						}
 					}
 					return null;
 				}
 			}, AccessController.getContext());
 		}
-		catch (java.security.PrivilegedActionException pae) {
+		catch (java.security.PrivilegedActionException ex) {
+			// Ignore
 		}
 	}
 }
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
index 52233eaaf1..accead37ed 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
@@ -308,7 +308,7 @@ public class PropertiesLauncher extends Launcher {
 			this.logger.info("Main class from home directory manifest: " + mainClass);
 			return mainClass;
 		}
-		catch (IllegalStateException e) {
+		catch (IllegalStateException ex) {
 			// Otherwise try the parent archive
 			String mainClass = createArchive().getMainClass();
 			this.logger.info("Main class from archive manifest: " + mainClass);
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java
index 2608a3ba81..0ddb0534d1 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java
@@ -65,7 +65,7 @@ public abstract class Archive {
 		try {
 			return getUrl().toString();
 		}
-		catch (Exception e) {
+		catch (Exception ex) {
 			return "archive";
 		}
 	}
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java
index c96a76d596..73bd8dae8c 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java
@@ -44,7 +44,7 @@ import org.springframework.boot.loader.tools.MainClassFinder;
  * @author Phillip Webb
  */
 @Mojo(name = "run", requiresProject = true, defaultPhase = LifecyclePhase.VALIDATE, requiresDependencyResolution = ResolutionScope.TEST)
-@Execute(phase=LifecyclePhase.TEST_COMPILE)
+@Execute(phase = LifecyclePhase.TEST_COMPILE)
 public class RunMojo extends AbstractMojo {
 
 	/**
@@ -179,7 +179,7 @@ public class RunMojo extends AbstractMojo {
 						hasNonDaemonThreads = true;
 						thread.join();
 					}
-					catch (InterruptedException e) {
+					catch (InterruptedException ex) {
 						Thread.currentThread().interrupt();
 					}
 				}
@@ -249,8 +249,8 @@ public class RunMojo extends AbstractMojo {
 								+ "main method with appropriate signature.", ex);
 				thread.getThreadGroup().uncaughtException(thread, wrappedEx);
 			}
-			catch (Exception e) {
-				thread.getThreadGroup().uncaughtException(thread, e);
+			catch (Exception ex) {
+				thread.getThreadGroup().uncaughtException(thread, ex);
 			}
 		}
 	}
diff --git a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java
index 5d14dd8c2c..3a1f3685fc 100644
--- a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java
+++ b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java
@@ -116,7 +116,7 @@ public abstract class AnsiOutput {
 			}
 			return !(OPERATING_SYSTEM_NAME.indexOf("win") >= 0);
 		}
-		catch (Throwable e) {
+		catch (Throwable ex) {
 			return false;
 		}
 	}
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java
index 3e92db4808..831326accb 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java
@@ -59,7 +59,7 @@ public class PropertySourcesPropertyValues implements PropertyValues {
 						try {
 							value = resolver.getProperty(propertyName);
 						}
-						catch (RuntimeException e) {
+						catch (RuntimeException ex) {
 							// Probably could not resolve placeholders, ignore it here
 						}
 						this.propertyValues.put(propertyName, new PropertyValue(
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java
index d9139f237d..374081b1ce 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java
@@ -121,9 +121,9 @@ public class EmbeddedWebApplicationContext extends GenericWebApplicationContext
 		try {
 			super.refresh();
 		}
-		catch (RuntimeException e) {
+		catch (RuntimeException ex) {
 			stopAndReleaseEmbeddedServletContainer();
-			throw e;
+			throw ex;
 		}
 	}
 
@@ -340,11 +340,11 @@ public class EmbeddedWebApplicationContext extends GenericWebApplicationContext
 					WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, ex);
 			throw ex;
 		}
-		catch (Error err) {
-			logger.error("Context initialization failed", err);
+		catch (Error ex) {
+			logger.error("Context initialization failed", ex);
 			servletContext.setAttribute(
-					WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, err);
-			throw err;
+					WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, ex);
+			throw ex;
 		}
 	}
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
index 33f0744774..e8d9f750ee 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
@@ -74,8 +74,8 @@ public class TomcatEmbeddedServletContainer implements EmbeddedServletContainer
 				Connector connector = this.tomcat.getConnector();
 				connector.getProtocolHandler().stop();
 			}
-			catch (Exception e) {
-				this.logger.error("Cannot pause connector: ", e);
+			catch (Exception ex) {
+				this.logger.error("Cannot pause connector: ", ex);
 			}
 			// Unlike Jetty, all Tomcat threads are daemon threads. We create a
 			// blocking non-daemon to stop immediate shutdown
@@ -105,8 +105,8 @@ public class TomcatEmbeddedServletContainer implements EmbeddedServletContainer
 			try {
 				connector.getProtocolHandler().start();
 			}
-			catch (Exception e) {
-				this.logger.error("Cannot start connector: ", e);
+			catch (Exception ex) {
+				this.logger.error("Cannot start connector: ", ex);
 			}
 		}
 	}
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
index 6d9b15f411..a38e04a8d3 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
@@ -454,9 +454,9 @@ public class TomcatEmbeddedServletContainerFactory extends
 					}
 				}
 			}
-			catch (ClassNotFoundException e) {
+			catch (ClassNotFoundException ex) {
 			}
-			catch (LinkageError e) {
+			catch (LinkageError ex) {
 			}
 			return nativePage;
 		}
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
index 2fb50eac60..13c8e54b30 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
@@ -85,7 +85,7 @@ public class TomcatEmbeddedWebappClassLoader extends WebappClassLoader {
 		try {
 			return Class.forName(name, false, this.parent);
 		}
-		catch (ClassNotFoundException e) {
+		catch (ClassNotFoundException ex) {
 			return null;
 		}
 	}
@@ -94,7 +94,7 @@ public class TomcatEmbeddedWebappClassLoader extends WebappClassLoader {
 		try {
 			return findClass(name);
 		}
-		catch (ClassNotFoundException e) {
+		catch (ClassNotFoundException ex) {
 			return null;
 		}
 	}
@@ -105,9 +105,9 @@ public class TomcatEmbeddedWebappClassLoader extends WebappClassLoader {
 				this.securityManager.checkPackageAccess(name.substring(0,
 						name.lastIndexOf('.')));
 			}
-			catch (SecurityException se) {
+			catch (SecurityException ex) {
 				throw new ClassNotFoundException("Security Violation, attempt to use "
-						+ "Restricted Class: " + name, se);
+						+ "Restricted Class: " + name, ex);
 			}
 		}
 	}
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/initializer/VcapApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/initializer/VcapApplicationContextInitializer.java
index be2162988b..91831962f3 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/initializer/VcapApplicationContextInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/initializer/VcapApplicationContextInitializer.java
@@ -160,8 +160,8 @@ public class VcapApplicationContextInitializer implements
 				properties.putAll(map);
 			}
 		}
-		catch (Exception e) {
-			logger.error("Could not parse VCAP_APPLICATION", e);
+		catch (Exception ex) {
+			logger.error("Could not parse VCAP_APPLICATION", ex);
 		}
 		return properties;
 	}
@@ -187,8 +187,8 @@ public class VcapApplicationContextInitializer implements
 				}
 			}
 		}
-		catch (Exception e) {
-			logger.error("Could not parse VCAP_APPLICATION", e);
+		catch (Exception ex) {
+			logger.error("Could not parse VCAP_APPLICATION", ex);
 		}
 		return properties;
 	}
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/java/SimpleFormatter.java b/spring-boot/src/main/java/org/springframework/boot/logging/java/SimpleFormatter.java
index 55f8d16ad9..c62bcdc8e2 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/java/SimpleFormatter.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/java/SimpleFormatter.java
@@ -71,7 +71,7 @@ public class SimpleFormatter extends Formatter {
 		try {
 			value = System.getenv(key);
 		}
-		catch (Exception e) {
+		catch (Exception ex) {
 			// ignore
 		}
 		if (value == null) {
diff --git a/spring-boot/src/test/java/org/springframework/boot/OutputCapture.java b/spring-boot/src/test/java/org/springframework/boot/OutputCapture.java
index b4dd043af0..3da40f3471 100644
--- a/spring-boot/src/test/java/org/springframework/boot/OutputCapture.java
+++ b/spring-boot/src/test/java/org/springframework/boot/OutputCapture.java
@@ -77,7 +77,7 @@ public class OutputCapture implements TestRule {
 			this.captureOut.flush();
 			this.captureErr.flush();
 		}
-		catch (IOException e) {
+		catch (IOException ex) {
 			// ignore
 		}
 	}
@@ -144,7 +144,7 @@ public class OutputCapture implements TestRule {
 				Class.forName("org.springframework.boot.ansi.AnsiOutput");
 				return new AnsiPresentOutputControl();
 			}
-			catch (ClassNotFoundException e) {
+			catch (ClassNotFoundException ex) {
 				return new AnsiOutputControl();
 			}
 		}