diff --git a/src/main/java/org/assertj/assertions/generator/BaseAssertionGenerator.java b/src/main/java/org/assertj/assertions/generator/BaseAssertionGenerator.java
index ca96069..dc01292 100644
--- a/src/main/java/org/assertj/assertions/generator/BaseAssertionGenerator.java
+++ b/src/main/java/org/assertj/assertions/generator/BaseAssertionGenerator.java
@@ -497,17 +497,23 @@ private String generateAssertionEntryPointMethodsFor(final Set<ClassDescription>
       // resolve class assert (ex: PlayerAssert)
       // in case of inner classes like Movie.PublicCategory, class assert will be MoviePublicCategoryAssert
       assertionEntryPointMethodContent = replace(assertionEntryPointMethodContent, CUSTOM_ASSERTION_CLASS,
-                                                 classDescription.getFullyQualifiedAssertClassName());
+                                                 getAssertClassName(classDescription));
       // resolve class (ex: Player)
       // in case of inner classes like Movie.PublicCategory use class name with outer class i.e. Movie.PublicCategory.
       assertionEntryPointMethodContent = replace(assertionEntryPointMethodContent, CLASS_TO_ASSERT,
-                                                 classDescription.getFullyQualifiedClassName());
+              classDescription.getFullyQualifiedClassName());
 
       allAssertThatsContentBuilder.append(lineSeparator).append(assertionEntryPointMethodContent);
     }
     return allAssertThatsContentBuilder.toString();
   }
 
+  private String getAssertClassName(final ClassDescription classDescription) {
+    return generatedAssertionsPackage == null ?
+            classDescription.getFullyQualifiedAssertClassName() :
+            generatedAssertionsPackage + "." + classDescription.getAssertClassName();
+  }
+
   private String determineBestEntryPointsAssertionsClassPackage(final Set<ClassDescription> classDescriptionSet) {
     if (generatedAssertionsPackage != null) {
       return generatedAssertionsPackage;