diff --git a/java/pom.xml b/java/pom.xml
index 48332aa13..e905c65ab 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -63,7 +63,6 @@
       <configuration>
         <release>8</release>
         <testExcludes>
-          <testExclude>**/LongEnum.java</testExclude>
           <testExclude>MyGame/Example/MonsterStorageGrpc.java</testExclude>
           <testExclude>MyGame/Example/StructOfStructs**</testExclude>
           <testExclude>MyGame/OtherNameSpace/TableBT.java</testExclude>
diff --git a/src/idl_gen_java.cpp b/src/idl_gen_java.cpp
index 0ceda7fad..f5a04d3af 100644
--- a/src/idl_gen_java.cpp
+++ b/src/idl_gen_java.cpp
@@ -397,6 +397,10 @@ class JavaGenerator : public BaseGenerator {
       code += " ";
       code += namer_.Variant(ev) + " = ";
       code += enum_def.ToString(ev);
+      if (enum_def.underlying_type.base_type == BASE_TYPE_LONG ||
+          enum_def.underlying_type.base_type == BASE_TYPE_ULONG) {
+        code += "L";
+      }
       code += ";\n";
     }
 
diff --git a/tests/MyGame/Example/LongEnum.java b/tests/MyGame/Example/LongEnum.java
index 4640f08aa..ca2f81af5 100644
--- a/tests/MyGame/Example/LongEnum.java
+++ b/tests/MyGame/Example/LongEnum.java
@@ -5,8 +5,8 @@ package MyGame.Example;
 @SuppressWarnings("unused")
 public final class LongEnum {
   private LongEnum() { }
-  public static final long LongOne = 2;
-  public static final long LongTwo = 4;
-  public static final long LongBig = 1099511627776;
+  public static final long LongOne = 2L;
+  public static final long LongTwo = 4L;
+  public static final long LongBig = 1099511627776L;
 }