diff --git a/processor/src/test/java/org/mapstruct/ap/test/model/Car.java b/processor/src/test/java/org/mapstruct/ap/test/complex/Car.java
similarity index 98%
rename from processor/src/test/java/org/mapstruct/ap/test/model/Car.java
rename to processor/src/test/java/org/mapstruct/ap/test/complex/Car.java
index 0b0c7f236..993bbb857 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/model/Car.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/Car.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.model;
+package org.mapstruct.ap.test.complex;
 
 import java.util.Date;
 import java.util.List;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/model/CarDto.java b/processor/src/test/java/org/mapstruct/ap/test/complex/CarDto.java
similarity index 98%
rename from processor/src/test/java/org/mapstruct/ap/test/model/CarDto.java
rename to processor/src/test/java/org/mapstruct/ap/test/complex/CarDto.java
index 6565f33be..8dabeb940 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/model/CarDto.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/CarDto.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.model;
+package org.mapstruct.ap.test.complex;
 
 import java.util.List;
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/model/CarMapper.java b/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapper.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/model/CarMapper.java
rename to processor/src/test/java/org/mapstruct/ap/test/complex/CarMapper.java
index a7ab15c3e..73fcfc137 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/model/CarMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapper.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.model;
+package org.mapstruct.ap.test.complex;
 
 import java.util.List;
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/model/CarMapperTest.java b/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapperTest.java
similarity index 99%
rename from processor/src/test/java/org/mapstruct/ap/test/model/CarMapperTest.java
rename to processor/src/test/java/org/mapstruct/ap/test/complex/CarMapperTest.java
index 8f8afd9a5..b24e3ed4a 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/model/CarMapperTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapperTest.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.model;
+package org.mapstruct.ap.test.complex;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/model/Category.java b/processor/src/test/java/org/mapstruct/ap/test/complex/Category.java
similarity index 94%
rename from processor/src/test/java/org/mapstruct/ap/test/model/Category.java
rename to processor/src/test/java/org/mapstruct/ap/test/complex/Category.java
index 708b39ec3..40647826f 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/model/Category.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/Category.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.model;
+package org.mapstruct.ap.test.complex;
 
 public enum Category {
     SEDAN, CONVERTIBLE, TRUCK;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/model/DateMapper.java b/processor/src/test/java/org/mapstruct/ap/test/complex/DateMapper.java
similarity index 96%
rename from processor/src/test/java/org/mapstruct/ap/test/model/DateMapper.java
rename to processor/src/test/java/org/mapstruct/ap/test/complex/DateMapper.java
index e0552d6bf..9eecf3fac 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/model/DateMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/DateMapper.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.model;
+package org.mapstruct.ap.test.complex;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/model/Person.java b/processor/src/test/java/org/mapstruct/ap/test/complex/Person.java
similarity index 95%
rename from processor/src/test/java/org/mapstruct/ap/test/model/Person.java
rename to processor/src/test/java/org/mapstruct/ap/test/complex/Person.java
index f4e7dbfbd..2ee12356c 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/model/Person.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/Person.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.model;
+package org.mapstruct.ap.test.complex;
 
 public class Person {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/model/PersonDto.java b/processor/src/test/java/org/mapstruct/ap/test/complex/PersonDto.java
similarity index 95%
rename from processor/src/test/java/org/mapstruct/ap/test/model/PersonDto.java
rename to processor/src/test/java/org/mapstruct/ap/test/complex/PersonDto.java
index f613606be..8f60d77eb 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/model/PersonDto.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/PersonDto.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.model;
+package org.mapstruct.ap.test.complex;
 
 public class PersonDto {