diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/AttributeAccessorTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/AttributeAccessorTest.java
new file mode 100644
index 0000000000..c03e3909aa
--- /dev/null
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/AttributeAccessorTest.java
@@ -0,0 +1,99 @@
+/*
+ * 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.envers.test.integration.accesstype;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.AttributeAccessor;
+import org.hibernate.envers.Audited;
+import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase;
+import org.hibernate.property.access.internal.PropertyAccessStrategyBasicImpl;
+import org.hibernate.property.access.spi.PropertyAccess;
+import org.junit.Test;
+
+import org.hibernate.testing.TestForIssue;
+
+import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Chris Cranford
+ */
+@TestForIssue(jiraKey = "HHH-12063")
+public class AttributeAccessorTest extends BaseEnversJPAFunctionalTestCase {
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class<?>[] { Foo.class };
+	}
+
+	@Test
+	public void testAttributeAccessor() {
+		// Verify that the accessor was triggered during metadata building phase.
+		assertTrue( BasicAttributeAccessor.invoked );
+
+		// Create an audited entity
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final Foo foo = new Foo( 1, "ABC" );
+			entityManager.persist( foo );
+		} );
+
+		// query the entity.
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			final Foo foo = getAuditReader().find( Foo.class, 1, 1 );
+			assertEquals( "ABC", foo.getName() );
+		} );
+	}
+
+	@Entity(name = "Foo")
+	@Audited
+	public static class Foo {
+		private Integer id;
+		private String name;
+
+		public Foo() {
+
+		}
+
+		public Foo(Integer id) {
+			this.id = id;
+		}
+
+		public Foo(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		@Id
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		@AttributeAccessor( "org.hibernate.envers.test.integration.accesstype.AttributeAccessorTest$BasicAttributeAccessor" )
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	public static class BasicAttributeAccessor extends PropertyAccessStrategyBasicImpl {
+		static boolean invoked;
+		@Override
+		public PropertyAccess buildPropertyAccess(Class containerJavaType, String propertyName) {
+			invoked = true;
+			return super.buildPropertyAccess( containerJavaType, propertyName );
+		}
+	}
+}