diff --git a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryDatatypeTests.java b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryDatatypeTests.java
index eb86c8c15..ac78c2d95 100755
--- a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryDatatypeTests.java
+++ b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryDatatypeTests.java
@@ -149,47 +149,47 @@ public class ClassGeneratingPropertyAccessorFactoryDatatypeTests {
 	public static class FieldAccess {
 
 		int primitiveInteger;
-		int primitiveIntegerArray[];
+		int[] primitiveIntegerArray;
 		Integer boxedInteger;
-		Integer boxedIntegerArray[];
+		Integer[] boxedIntegerArray;
 
 		short primitiveShort;
-		short primitiveShortArray[];
+		short[] primitiveShortArray;
 		Short boxedShort;
-		Short boxedShortArray[];
+		Short[] boxedShortArray;
 
 		byte primitiveByte;
-		byte primitiveByteArray[];
+		byte[] primitiveByteArray;
 		Byte boxedByte;
-		Byte boxedByteArray[];
+		Byte[] boxedByteArray;
 
 		char primitiveChar;
-		char primitiveCharArray[];
+		char[] primitiveCharArray;
 		Character boxedChar;
-		Character boxedCharArray[];
+		Character[] boxedCharArray;
 
 		boolean primitiveBoolean;
-		boolean primitiveBooleanArray[];
+		boolean[] primitiveBooleanArray;
 		Boolean boxedBoolean;
-		Boolean boxedBooleanArray[];
+		Boolean[] boxedBooleanArray;
 
 		float primitiveFloat;
-		float primitiveFloatArray[];
+		float[] primitiveFloatArray;
 		Float boxedFloat;
-		Float boxedFloatArray[];
+		Float[] boxedFloatArray;
 
 		double primitiveDouble;
-		double primitiveDoubleArray[];
+		double[] primitiveDoubleArray;
 		Double boxedDouble;
-		Double boxedDoubleArray[];
+		Double[] boxedDoubleArray;
 
 		long primitiveLong;
-		long primitiveLongArray[];
+		long[] primitiveLongArray;
 		Long boxedLong;
-		Long boxedLongArray[];
+		Long[] boxedLongArray;
 
 		String string;
-		String stringArray[];
+		String[] stringArray;
 	}
 
 	// DATACMNS-809
@@ -198,47 +198,47 @@ public class ClassGeneratingPropertyAccessorFactoryDatatypeTests {
 	public static class PropertyAccess {
 
 		int primitiveInteger;
-		int primitiveIntegerArray[];
+		int[] primitiveIntegerArray;
 		Integer boxedInteger;
-		Integer boxedIntegerArray[];
+		Integer[] boxedIntegerArray;
 
 		short primitiveShort;
-		short primitiveShortArray[];
+		short[] primitiveShortArray;
 		Short boxedShort;
-		Short boxedShortArray[];
+		Short[] boxedShortArray;
 
 		byte primitiveByte;
-		byte primitiveByteArray[];
+		byte[] primitiveByteArray;
 		Byte boxedByte;
-		Byte boxedByteArray[];
+		Byte[] boxedByteArray;
 
 		char primitiveChar;
-		char primitiveCharArray[];
+		char[] primitiveCharArray;
 		Character boxedChar;
-		Character boxedCharArray[];
+		Character[] boxedCharArray;
 
 		boolean primitiveBoolean;
-		boolean primitiveBooleanArray[];
+		boolean[] primitiveBooleanArray;
 		Boolean boxedBoolean;
-		Boolean boxedBooleanArray[];
+		Boolean[] boxedBooleanArray;
 
 		float primitiveFloat;
-		float primitiveFloatArray[];
+		float[] primitiveFloatArray;
 		Float boxedFloat;
-		Float boxedFloatArray[];
+		Float[] boxedFloatArray;
 
 		double primitiveDouble;
-		double primitiveDoubleArray[];
+		double[] primitiveDoubleArray;
 		Double boxedDouble;
-		Double boxedDoubleArray[];
+		Double[] boxedDoubleArray;
 
 		long primitiveLong;
-		long primitiveLongArray[];
+		long[] primitiveLongArray;
 		Long boxedLong;
-		Long boxedLongArray[];
+		Long[] boxedLongArray;
 
 		String string;
-		String stringArray[];
+		String[] stringArray;
 	}
 
 	// DATACMNS-916
@@ -246,47 +246,48 @@ public class ClassGeneratingPropertyAccessorFactoryDatatypeTests {
 	private final static class PrivateFinalFieldAccess {
 
 		int primitiveInteger;
-		int primitiveIntegerArray[];
+		int[] primitiveIntegerArray;
 		Integer boxedInteger;
-		Integer boxedIntegerArray[];
+		Integer[] boxedIntegerArray;
 
 		short primitiveShort;
-		short primitiveShortArray[];
+		short[] primitiveShortArray;
 		Short boxedShort;
-		Short boxedShortArray[];
+		Short[] boxedShortArray;
 
 		byte primitiveByte;
-		byte primitiveByteArray[];
+		byte[] primitiveByteArray;
 		Byte boxedByte;
-		Byte boxedByteArray[];
+		Byte[] boxedByteArray;
 
 		char primitiveChar;
-		char primitiveCharArray[];
+		char[] primitiveCharArray;
 		Character boxedChar;
-		Character boxedCharArray[];
+		Character[] boxedCharArray;
 
 		boolean primitiveBoolean;
-		boolean primitiveBooleanArray[];
+		boolean[] primitiveBooleanArray;
 		Boolean boxedBoolean;
-		Boolean boxedBooleanArray[];
+		Boolean[] boxedBooleanArray;
 
 		float primitiveFloat;
-		float primitiveFloatArray[];
+		float[] primitiveFloatArray;
 		Float boxedFloat;
-		Float boxedFloatArray[];
+		Float[] boxedFloatArray;
 
 		double primitiveDouble;
-		double primitiveDoubleArray[];
+		double[] primitiveDoubleArray;
 		Double boxedDouble;
-		Double boxedDoubleArray[];
+		Double[] boxedDoubleArray;
 
 		long primitiveLong;
-		long primitiveLongArray[];
+		long[] primitiveLongArray;
 		Long boxedLong;
-		Long boxedLongArray[];
+		Long[] boxedLongArray;
 
 		String string;
-		String stringArray[];
+		String[] stringArray;
+
 	}
 
 	// DATACMNS-916
@@ -295,46 +296,47 @@ public class ClassGeneratingPropertyAccessorFactoryDatatypeTests {
 	private final static class PrivateFinalPropertyAccess {
 
 		int primitiveInteger;
-		int primitiveIntegerArray[];
+		int[] primitiveIntegerArray;
 		Integer boxedInteger;
-		Integer boxedIntegerArray[];
+		Integer[] boxedIntegerArray;
 
 		short primitiveShort;
-		short primitiveShortArray[];
+		short[] primitiveShortArray;
 		Short boxedShort;
-		Short boxedShortArray[];
+		Short[] boxedShortArray;
 
 		byte primitiveByte;
-		byte primitiveByteArray[];
+		byte[] primitiveByteArray;
 		Byte boxedByte;
-		Byte boxedByteArray[];
+		Byte[] boxedByteArray;
 
 		char primitiveChar;
-		char primitiveCharArray[];
+		char[] primitiveCharArray;
 		Character boxedChar;
-		Character boxedCharArray[];
+		Character[] boxedCharArray;
 
 		boolean primitiveBoolean;
-		boolean primitiveBooleanArray[];
+		boolean[] primitiveBooleanArray;
 		Boolean boxedBoolean;
-		Boolean boxedBooleanArray[];
+		Boolean[] boxedBooleanArray;
 
 		float primitiveFloat;
-		float primitiveFloatArray[];
+		float[] primitiveFloatArray;
 		Float boxedFloat;
-		Float boxedFloatArray[];
+		Float[] boxedFloatArray;
 
 		double primitiveDouble;
-		double primitiveDoubleArray[];
+		double[] primitiveDoubleArray;
 		Double boxedDouble;
-		Double boxedDoubleArray[];
+		Double[] boxedDoubleArray;
 
 		long primitiveLong;
-		long primitiveLongArray[];
+		long[] primitiveLongArray;
 		Long boxedLong;
-		Long boxedLongArray[];
+		Long[] boxedLongArray;
 
 		String string;
-		String stringArray[];
+		String[] stringArray;
+
 	}
 }