diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java
new file mode 100644
index 000000000000..af22ffdd77fb
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java
@@ -0,0 +1,78 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.jpa.test.persistenceunit;
+
+import java.util.Collections;
+import java.util.Map;
+import javax.persistence.Cacheable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.SharedCacheMode;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.Environment;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.jpa.boot.spi.Bootstrap;
+import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.persister.entity.EntityPersister;
+
+import org.hibernate.testing.TestForIssue;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+/**
+ * @author Gail Badner
+ */
+public class TwoPersistenceUnits2LCDisabledEnabled {
+
+	@Test
+	@TestForIssue( jiraKey = "HHH-11516" )
+	public void testDisabledEnabled() {
+		final Map<Object, Object> config = Environment.getProperties();
+		config.put( org.hibernate.jpa.AvailableSettings.LOADED_CLASSES, Collections.singletonList( AnEntity.class ) );
+		config.put( "javax.persistence.sharedCache.mode", SharedCacheMode.ENABLE_SELECTIVE );
+		config.put( AvailableSettings.USE_SECOND_LEVEL_CACHE, "false" );
+
+		testIt( config );
+
+		config.put( AvailableSettings.USE_SECOND_LEVEL_CACHE, "true" );
+
+		testIt( config );
+	}
+
+	private void testIt(Map config) {
+		EntityManagerFactoryBuilder entityManagerFactoryBuilder = Bootstrap.getEntityManagerFactoryBuilder(
+				new BaseEntityManagerFunctionalTestCase.TestingPersistenceUnitDescriptorImpl( getClass().getSimpleName() ),
+				config
+		);
+		SessionFactoryImplementor sf = entityManagerFactoryBuilder.build().unwrap( SessionFactoryImplementor.class );
+		final EntityPersister persister = sf.getMetamodel().entityPersister( AnEntity.class.getName() );
+
+		try {
+			if ( config.get( AvailableSettings.USE_SECOND_LEVEL_CACHE ).equals( "true" ) ) {
+				assertNotNull( persister.getCacheAccessStrategy() );
+			}
+			else {
+				assertNull( persister.getCacheAccessStrategy() );
+			}
+		}
+		finally {
+			sf.close();
+		}
+	}
+
+
+	@Cacheable
+	@Entity( name = "AnEntity" )
+	public static class AnEntity {
+		@Id
+		private Long id;
+	}
+}