diff --git a/core/src/test/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManagerTests.java b/core/src/test/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManagerTests.java
index df6f583223..50e73593d2 100644
--- a/core/src/test/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManagerTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -86,7 +86,7 @@ public class UserDetailsRepositoryReactiveAuthenticationManagerTests {
 	}
 
 	@Test
-	public void authentiateWhenCustomSchedulerThenUsed() {
+	public void authenticateWhenCustomSchedulerThenUsed() {
 		given(this.scheduler.schedule(any())).willAnswer((a) -> {
 			Runnable r = a.getArgument(0);
 			return Schedulers.immediate().schedule(r);
diff --git a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java
index 198ffd8f04..66cc64b30e 100644
--- a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java
+++ b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2021 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.
@@ -50,7 +50,7 @@ public class BouncyCastleAesBytesEncryptorEquivalencyTests {
 	}
 
 	@Test
-	public void bouncyCastleAesCbcWithPredictableIvEquvalent() throws Exception {
+	public void bouncyCastleAesCbcWithPredictableIvEquivalent() throws Exception {
 		CryptoAssumptions.assumeCBCJCE();
 		BytesEncryptor bcEncryptor = new BouncyCastleAesCbcBytesEncryptor(this.password, this.salt,
 				new PredictableRandomBytesKeyGenerator(16));
@@ -69,7 +69,7 @@ public class BouncyCastleAesBytesEncryptorEquivalencyTests {
 	}
 
 	@Test
-	public void bouncyCastleAesGcmWithPredictableIvEquvalent() throws Exception {
+	public void bouncyCastleAesGcmWithPredictableIvEquivalent() throws Exception {
 		CryptoAssumptions.assumeGCMJCE();
 		BytesEncryptor bcEncryptor = new BouncyCastleAesGcmBytesEncryptor(this.password, this.salt,
 				new PredictableRandomBytesKeyGenerator(16));
diff --git a/crypto/src/test/java/org/springframework/security/crypto/password/PasswordEncoderUtilsTests.java b/crypto/src/test/java/org/springframework/security/crypto/password/PasswordEncoderUtilsTests.java
index 0beaa5aa9f..726c9420d6 100644
--- a/crypto/src/test/java/org/springframework/security/crypto/password/PasswordEncoderUtilsTests.java
+++ b/crypto/src/test/java/org/springframework/security/crypto/password/PasswordEncoderUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -32,7 +32,7 @@ public class PasswordEncoderUtilsTests {
 	}
 
 	@Test
-	public void equalsWhenNullAndNotEmtpyThenFalse() {
+	public void equalsWhenNullAndNotEmptyThenFalse() {
 		assertThat(PasswordEncoderUtils.equals(null, "a")).isFalse();
 		assertThat(PasswordEncoderUtils.equals("a", null)).isFalse();
 	}
@@ -55,7 +55,7 @@ public class PasswordEncoderUtilsTests {
 	}
 
 	@Test
-	public void equalsWhenEmtpyAndEmptyThenTrue() {
+	public void equalsWhenEmptyAndEmptyThenTrue() {
 		assertThat(PasswordEncoderUtils.equals("", "")).isTrue();
 	}
 
diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java
index e9a12e16c9..c7463f3914 100644
--- a/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java
+++ b/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java
@@ -120,7 +120,7 @@ public class DefaultSpringSecurityContextSourceTests {
 	}
 
 	@Test
-	public void instantiationSuceedsWithProperServerList() {
+	public void instantiationSucceedsWithProperServerList() {
 		List<String> serverUrls = new ArrayList<>();
 		serverUrls.add("ldap://foo:789");
 		serverUrls.add("ldap://bar:389");
@@ -134,7 +134,7 @@ public class DefaultSpringSecurityContextSourceTests {
 
 	// SEC-2308
 	@Test
-	public void instantiationSuceedsWithEmtpyBaseDn() {
+	public void instantiationSucceedsWithEmptyBaseDn() {
 		String baseDn = "";
 		List<String> serverUrls = new ArrayList<>();
 		serverUrls.add("ldap://foo:789");
diff --git a/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java b/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java
index bda60ba088..b340512a67 100644
--- a/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 the original author or authors.
+ * Copyright 2010-2021 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.
@@ -76,7 +76,7 @@ public class JaasApiIntegrationFilter extends GenericFilterBean {
 
 		Subject subject = obtainSubject(request);
 		if (subject == null && this.createEmptySubject) {
-			this.logger.debug("Subject returned was null and createEmtpySubject is true; "
+			this.logger.debug("Subject returned was null and createEmptySubject is true; "
 					+ "creating new empty subject to run as.");
 			subject = new Subject();
 		}
diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherTests.java
index c76e1725ac..2a022318ab 100644
--- a/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherTests.java
+++ b/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -81,7 +81,7 @@ public class MediaTypeRequestMatcherTests {
 	}
 
 	@Test
-	public void constructorEmtpyMediaTypes() {
+	public void constructorEmptyMediaTypes() {
 		assertThatIllegalArgumentException().isThrownBy(
 				() -> new MediaTypeRequestMatcher(this.negotiationStrategy, Collections.<MediaType>emptyList()));
 	}