diff --git a/modules/java/android_test/src/org/opencv/test/core/KDTreeTest.java b/modules/java/android_test/src/org/opencv/test/core/KDTreeTest.java
deleted file mode 100644
index fdd2213b7..000000000
--- a/modules/java/android_test/src/org/opencv/test/core/KDTreeTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.opencv.test.core;
-
-import org.opencv.test.OpenCVTestCase;
-
-public class KDTreeTest extends OpenCVTestCase {
-
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	public void testBuildMat() {
-		fail("Not yet implemented");
-	}
-
-	public void testBuildMatBoolean() {
-		fail("Not yet implemented");
-	}
-
-	public void testBuildMatMat() {
-		fail("Not yet implemented");
-	}
-
-	public void testBuildMatMatBoolean() {
-		fail("Not yet implemented");
-	}
-
-	public void testDims() {
-		fail("Not yet implemented");
-	}
-
-	public void testFindNearestMatIntIntMat() {
-		fail("Not yet implemented");
-	}
-
-	public void testFindNearestMatIntIntMatMat() {
-		fail("Not yet implemented");
-	}
-
-	public void testFindNearestMatIntIntMatMatMat() {
-		fail("Not yet implemented");
-	}
-
-	public void testFindNearestMatIntIntMatMatMatMat() {
-		fail("Not yet implemented");
-	}
-
-	public void testFindOrthoRangeMatMatMat() {
-		fail("Not yet implemented");
-	}
-
-	public void testFindOrthoRangeMatMatMatMat() {
-		fail("Not yet implemented");
-	}
-
-	public void testFindOrthoRangeMatMatMatMatMat() {
-		fail("Not yet implemented");
-	}
-
-	public void testGet_maxDepth() {
-		fail("Not yet implemented");
-	}
-
-	public void testGet_normType() {
-		fail("Not yet implemented");
-	}
-
-	public void testGet_points() {
-		fail("Not yet implemented");
-	}
-
-	public void testGetPointsMatMat() {
-		fail("Not yet implemented");
-	}
-
-	public void testGetPointsMatMatMat() {
-		fail("Not yet implemented");
-	}
-
-	public void testKDTree() {
-		fail("Not yet implemented");
-	}
-
-	public void testKDTreeMat() {
-		fail("Not yet implemented");
-	}
-
-	public void testKDTreeMatBoolean() {
-		fail("Not yet implemented");
-	}
-
-	public void testKDTreeMatMat() {
-		fail("Not yet implemented");
-	}
-
-	public void testKDTreeMatMatBoolean() {
-		fail("Not yet implemented");
-	}
-
-	public void testSet_normType() {
-		fail("Not yet implemented");
-	}
-
-}
diff --git a/modules/java/gen_java.py b/modules/java/gen_java.py
index 4bb1feaac..d5e24f3f7 100644
--- a/modules/java/gen_java.py
+++ b/modules/java/gen_java.py
@@ -8,7 +8,7 @@ except:
 
 class_ignore_list = (
     #core
-    "FileNode", "FileStorage",
+    "FileNode", "FileStorage", "KDTree",
     #highgui
     "VideoWriter", "VideoCapture",
     #features2d
@@ -1069,6 +1069,9 @@ extern "C" {
                         c_prologue.append("%s %s;" % (a.ctype, a.name))
 
             rtype = type_dict[fi.ctype].get("jni_type", "jdoubleArray")
+            clazz = self.Module
+            if fi.classname:
+                clazz = self.classes[fi.classname].jname
             cpp_code.write ( Template( \
 """
 
@@ -1099,7 +1102,7 @@ JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname
 """ ).substitute( \
         rtype = rtype, \
         module = self.module, \
-        clazz = fi.classname or self.Module, \
+        clazz = clazz, \
         fname = fi.jni_name + ["",suffix][isoverload], \
         args = ", ".join(["%s %s" % (type_dict[a.ctype].get("jni_type"), a.name) for a in jni_args]), \
         prologue = "\n        ".join(c_prologue), \