@@ -139,9 +139,8 @@ private static IRubyObject javaImport(ThreadContext context, RubyModule target,
         proxyClass = Java.getProxyClass(runtime, javaClass);
 
         try {
-            if (!target.const_defined_p(context, runtime.newSymbol(constant)).isTrue() ||
-                    !target.getConstant(constant).equals(proxyClass)) {
-                target.setConstant(constant, proxyClass);
+            if (!target.constDefinedAt(constant) || !target.getConstant(constant, false).equals(proxyClass)) {
+                target.const_set(runtime.newSymbol(constant), proxyClass); // setConstant would not validate const-name
             }
         } catch (NameError e) {
             String message = "cannot import Java class " + javaClass.getName() + " as `" + constant + "' : " + e.getException().getMessage();
 
@@ -46,5 +46,35 @@
     expect(mod::CapsInnerClass).to eq(InnerClasses::CapsInnerClass)
   end
 
+  class Object
+    java_import 'javax.lang.model.element.Element'
+  end
+
+  module JavaImportSpec
+    java_import 'javax.lang.model.element.Element'
+    module Nested
+      java_import org.w3c.dom.Element
+      module Nested2
+        java_import 'org.w3c.dom.Element'
+      end
+    end if Element
+    module NestedAgain
+      java_import 'javax.lang.model.element.Element'
+    end
+  end
+
+  it "sets constant into proper scope (when parent has same name)" do
+    Object.send(:remove_const, :Element)
+    expect(JavaImportSpec::Element).to be(javax.lang.model.element.Element) # used to fail in JRuby <= 9.4.5
+
+    expect(JavaImportSpec::Nested::Element).to be(org.w3c.dom.Element)
+
+    expect(JavaImportSpec::Nested::Nested2.constants).to eql [:Element]
+    expect(JavaImportSpec::NestedAgain.constants).to eql [:Element]
+
+    expect(JavaImportSpec::Nested::Nested2::Element).to be(org.w3c.dom.Element)
+    expect(JavaImportSpec::NestedAgain::Element).to be(javax.lang.model.element.Element)
+  end
+
 end