diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java
index d9295d6d7..fde9f96f6 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java
@@ -106,9 +106,8 @@ public Environment findOne(String application, String profile, String label) {
 		}
 		String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
 		Environment environment = new Environment(application, profiles, label, null, null);
-		if (!config.startsWith("application")) {
-			config = "application," + config;
-		}
+		// the shared "application" is always included, duplicates are removed below
+		config = "application," + config;
 		List<String> applications = new ArrayList<>(
 				new LinkedHashSet<>(Arrays.asList(StringUtils.commaDelimitedListToStringArray(config))));
 		List<String> envs = new ArrayList<>(new LinkedHashSet<>(Arrays.asList(profiles)));
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/compliance/JdbcEnvironmentRepositoryComplianceTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/compliance/JdbcEnvironmentRepositoryComplianceTests.java
index 7ae3df9ae..f472bc045 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/compliance/JdbcEnvironmentRepositoryComplianceTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/compliance/JdbcEnvironmentRepositoryComplianceTests.java
@@ -21,8 +21,6 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
 
 import org.springframework.cloud.config.server.environment.EnvironmentRepository;
 import org.springframework.cloud.config.server.environment.JdbcEnvironmentProperties;
@@ -61,13 +59,6 @@ protected EnvironmentRepositoryFixture fixture() {
 		return this.fixture;
 	}
 
-	@Override
-	@Test
-	@Disabled("TODO-issue: Shared application properties are skipped when the application name starts with application")
-	public void applicationNameStartingWithApplicationIncludesSharedFiles() throws Exception {
-		super.applicationNameStartingWithApplicationIncludesSharedFiles();
-	}
-
 	static class Fixture implements EnvironmentRepositoryFixture {
 
 		private final JdbcTemplate jdbc = new JdbcTemplate(database);