diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
index 79d82c992fd..5a0511e45a4 100644
--- a/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -1064,15 +1064,16 @@ definitions:
           type: object
           additionalProperties:
             type: string  
-      map_map_of_enum:
-        type: object
-        additionalProperties:
-          type: object
-          additionalProperties:
-            type: string  
-            enum:
-              - UPPER
-              - lower
+      # comment out the following (map of map of enum) as many language not yet support this
+      #map_map_of_enum:
+      #  type: object
+      #  additionalProperties:
+      #    type: object
+      #    additionalProperties:
+      #      type: string  
+      #      enum:
+      #        - UPPER
+      #        - lower
       map_of_enum_string:
         type: object
         additionalProperties:
diff --git a/samples/client/petstore/java/okhttp-gson/docs/MapTest.md b/samples/client/petstore/java/okhttp-gson/docs/MapTest.md
index 67450f9a4fe..c671e97ffbc 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/MapTest.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/MapTest.md
@@ -5,16 +5,9 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | [**Map<String, Map<String, String>>**](Map.md) |  |  [optional]
-**mapMapOfEnum** | [**Map<String, Map<String, InnerEnum>>**](#Map<String, Map<String, InnerEnum>>) |  |  [optional]
 **mapOfEnumString** | [**Map<String, InnerEnum>**](#Map<String, InnerEnum>) |  |  [optional]
 
 
-<a name="Map<String, Map<String, InnerEnum>>"></a>
-## Enum: Map&lt;String, Map&lt;String, InnerEnum&gt;&gt;
-Name | Value
----- | -----
-
-
 <a name="Map<String, InnerEnum>"></a>
 ## Enum: Map&lt;String, InnerEnum&gt;
 Name | Value
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MapTest.java
index daf8e9ca9ee..61bdb6b2c65 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MapTest.java
@@ -42,9 +42,6 @@ public class MapTest   {
   @SerializedName("map_map_of_string")
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<String, Map<String, String>>();
 
-  @SerializedName("map_map_of_enum")
-  private Map<String, Map<String, InnerEnum>> mapMapOfEnum = new HashMap<String, InnerEnum<String, String>>();
-
   /**
    * Gets or Sets inner
    */
@@ -88,24 +85,6 @@ public class MapTest   {
     this.mapMapOfString = mapMapOfString;
   }
 
-  public MapTest mapMapOfEnum(Map<String, Map<String, InnerEnum>> mapMapOfEnum) {
-    this.mapMapOfEnum = mapMapOfEnum;
-    return this;
-  }
-
-   /**
-   * Get mapMapOfEnum
-   * @return mapMapOfEnum
-  **/
-  @ApiModelProperty(example = "null", value = "")
-  public Map<String, Map<String, InnerEnum>> getMapMapOfEnum() {
-    return mapMapOfEnum;
-  }
-
-  public void setMapMapOfEnum(Map<String, Map<String, InnerEnum>> mapMapOfEnum) {
-    this.mapMapOfEnum = mapMapOfEnum;
-  }
-
   public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
     this.mapOfEnumString = mapOfEnumString;
     return this;
@@ -135,13 +114,12 @@ public class MapTest   {
     }
     MapTest mapTest = (MapTest) o;
     return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapMapOfEnum, mapTest.mapMapOfEnum) &&
         Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapMapOfString, mapMapOfEnum, mapOfEnumString);
+    return Objects.hash(mapMapOfString, mapOfEnumString);
   }
 
   @Override
@@ -150,7 +128,6 @@ public class MapTest   {
     sb.append("class MapTest {\n");
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
-    sb.append("    mapMapOfEnum: ").append(toIndentedString(mapMapOfEnum)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
     sb.append("}");
     return sb.toString();