diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DENSEFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DENSEFeatureDetectorTest.java
index a5e7be57e5..cced3c86a9 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/DENSEFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DENSEFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class DENSEFeatureDetectorTest extends TestCase {
+public class DENSEFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicDENSEFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicDENSEFeatureDetectorTest.java
index bd1a7a5811..56bb0415f2 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicDENSEFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicDENSEFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class DynamicDENSEFeatureDetectorTest extends TestCase {
+public class DynamicDENSEFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicFASTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicFASTFeatureDetectorTest.java
index 770d4a55e9..3b40f04118 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicFASTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicFASTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class DynamicFASTFeatureDetectorTest extends TestCase {
+public class DynamicFASTFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicGFTTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicGFTTFeatureDetectorTest.java
index 83194bf039..70718c4a47 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicGFTTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicGFTTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class DynamicGFTTFeatureDetectorTest extends TestCase {
+public class DynamicGFTTFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicHARRISFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicHARRISFeatureDetectorTest.java
index 51fb0fb5cd..22c6c29e94 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicHARRISFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicHARRISFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class DynamicHARRISFeatureDetectorTest extends TestCase {
+public class DynamicHARRISFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicMSERFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicMSERFeatureDetectorTest.java
index 202807c782..ea9af1b340 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicMSERFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicMSERFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class DynamicMSERFeatureDetectorTest extends TestCase {
+public class DynamicMSERFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicORBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicORBFeatureDetectorTest.java
index a0f1ab84d7..c20e6780c6 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicORBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicORBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class DynamicORBFeatureDetectorTest extends TestCase {
+public class DynamicORBFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIFTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIFTFeatureDetectorTest.java
index 56f5a7cc04..087e3df183 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIFTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIFTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class DynamicSIFTFeatureDetectorTest extends TestCase {
+public class DynamicSIFTFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIMPLEBLOBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIMPLEBLOBFeatureDetectorTest.java
index 942124ef28..7de2dbe0a0 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIMPLEBLOBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIMPLEBLOBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class DynamicSIMPLEBLOBFeatureDetectorTest extends TestCase {
+public class DynamicSIMPLEBLOBFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSTARFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSTARFeatureDetectorTest.java
index d4e687fe70..5dca31a225 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSTARFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSTARFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class DynamicSTARFeatureDetectorTest extends TestCase {
+public class DynamicSTARFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSURFFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSURFFeatureDetectorTest.java
index 34a767ca8b..d83fa7cc33 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSURFFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSURFFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class DynamicSURFFeatureDetectorTest extends TestCase {
+public class DynamicSURFFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GFTTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GFTTFeatureDetectorTest.java
index 09661c67f6..98b3a83885 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/GFTTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GFTTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class GFTTFeatureDetectorTest extends TestCase {
+public class GFTTFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridDENSEFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridDENSEFeatureDetectorTest.java
index 056d893c2b..3a3200f029 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridDENSEFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridDENSEFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class GridDENSEFeatureDetectorTest extends TestCase {
+public class GridDENSEFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridFASTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridFASTFeatureDetectorTest.java
index c4c6959703..c826ef87ee 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridFASTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridFASTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class GridFASTFeatureDetectorTest extends TestCase {
+public class GridFASTFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridGFTTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridGFTTFeatureDetectorTest.java
index 9181f97bee..a64da49411 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridGFTTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridGFTTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class GridGFTTFeatureDetectorTest extends TestCase {
+public class GridGFTTFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridHARRISFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridHARRISFeatureDetectorTest.java
index 86c7677775..7bbc57f25b 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridHARRISFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridHARRISFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class GridHARRISFeatureDetectorTest extends TestCase {
+public class GridHARRISFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridMSERFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridMSERFeatureDetectorTest.java
index c761049dea..656c835cc0 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridMSERFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridMSERFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class GridMSERFeatureDetectorTest extends TestCase {
+public class GridMSERFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridORBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridORBFeatureDetectorTest.java
index c987333a3f..53f419d14b 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridORBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridORBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class GridORBFeatureDetectorTest extends TestCase {
+public class GridORBFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridSIFTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridSIFTFeatureDetectorTest.java
index 46d2a08734..d44881d18b 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridSIFTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridSIFTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class GridSIFTFeatureDetectorTest extends TestCase {
+public class GridSIFTFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridSIMPLEBLOBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridSIMPLEBLOBFeatureDetectorTest.java
index 62a5dd3ec4..b493235c95 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridSIMPLEBLOBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridSIMPLEBLOBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class GridSIMPLEBLOBFeatureDetectorTest extends TestCase {
+public class GridSIMPLEBLOBFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridSTARFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridSTARFeatureDetectorTest.java
index d78dc242f0..36b99de765 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridSTARFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridSTARFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class GridSTARFeatureDetectorTest extends TestCase {
+public class GridSTARFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridSURFFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridSURFFeatureDetectorTest.java
index 012d825274..cc5a8232de 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridSURFFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridSURFFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class GridSURFFeatureDetectorTest extends TestCase {
+public class GridSURFFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/HARRISFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/HARRISFeatureDetectorTest.java
index 5e7fd7d3ce..d8acb1fa0f 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/HARRISFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/HARRISFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class HARRISFeatureDetectorTest extends TestCase {
+public class HARRISFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/MSERFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/MSERFeatureDetectorTest.java
index 98ae4d7025..9655f1d7e8 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/MSERFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/MSERFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class MSERFeatureDetectorTest extends TestCase {
+public class MSERFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/ORBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/ORBFeatureDetectorTest.java
index b4c23d8f62..eedcc213be 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/ORBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/ORBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class ORBFeatureDetectorTest extends TestCase {
+public class ORBFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/OpponentBRIEFDescriptorExtractorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/OpponentBRIEFDescriptorExtractorTest.java
index b158124ec1..ade2f7dc33 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/OpponentBRIEFDescriptorExtractorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/OpponentBRIEFDescriptorExtractorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class OpponentBRIEFDescriptorExtractorTest extends TestCase {
+public class OpponentBRIEFDescriptorExtractorTest extends OpenCVTestCase {
 
     public void testComputeListOfMatListOfListOfKeyPointListOfMat() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/OpponentORBDescriptorExtractorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/OpponentORBDescriptorExtractorTest.java
index 1ee5432092..88e2d9f39e 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/OpponentORBDescriptorExtractorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/OpponentORBDescriptorExtractorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class OpponentORBDescriptorExtractorTest extends TestCase {
+public class OpponentORBDescriptorExtractorTest extends OpenCVTestCase {
 
     public void testComputeListOfMatListOfListOfKeyPointListOfMat() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/OpponentSIFTDescriptorExtractorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/OpponentSIFTDescriptorExtractorTest.java
index de20c14094..d473ad6105 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/OpponentSIFTDescriptorExtractorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/OpponentSIFTDescriptorExtractorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class OpponentSIFTDescriptorExtractorTest extends TestCase {
+public class OpponentSIFTDescriptorExtractorTest extends OpenCVTestCase {
 
     public void testComputeListOfMatListOfListOfKeyPointListOfMat() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/OpponentSURFDescriptorExtractorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/OpponentSURFDescriptorExtractorTest.java
index e4271289b1..db18095961 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/OpponentSURFDescriptorExtractorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/OpponentSURFDescriptorExtractorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class OpponentSURFDescriptorExtractorTest extends TestCase {
+public class OpponentSURFDescriptorExtractorTest extends OpenCVTestCase {
 
     public void testComputeListOfMatListOfListOfKeyPointListOfMat() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidDENSEFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidDENSEFeatureDetectorTest.java
index cadabed2a7..5862f22128 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidDENSEFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidDENSEFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class PyramidDENSEFeatureDetectorTest extends TestCase {
+public class PyramidDENSEFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidFASTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidFASTFeatureDetectorTest.java
index 5527940ccc..8c2f4ed268 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidFASTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidFASTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class PyramidFASTFeatureDetectorTest extends TestCase {
+public class PyramidFASTFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidGFTTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidGFTTFeatureDetectorTest.java
index 13c45f1c94..de529eabe1 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidGFTTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidGFTTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class PyramidGFTTFeatureDetectorTest extends TestCase {
+public class PyramidGFTTFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidHARRISFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidHARRISFeatureDetectorTest.java
index 94ef84170b..d2878038ad 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidHARRISFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidHARRISFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class PyramidHARRISFeatureDetectorTest extends TestCase {
+public class PyramidHARRISFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidMSERFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidMSERFeatureDetectorTest.java
index c8891f7267..61f559312c 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidMSERFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidMSERFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class PyramidMSERFeatureDetectorTest extends TestCase {
+public class PyramidMSERFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidORBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidORBFeatureDetectorTest.java
index a507e5122c..056601df76 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidORBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidORBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class PyramidORBFeatureDetectorTest extends TestCase {
+public class PyramidORBFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIFTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIFTFeatureDetectorTest.java
index 27aa5f666d..922845efdf 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIFTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIFTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class PyramidSIFTFeatureDetectorTest extends TestCase {
+public class PyramidSIFTFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIMPLEBLOBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIMPLEBLOBFeatureDetectorTest.java
index 9f640f0ecd..258187688d 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIMPLEBLOBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIMPLEBLOBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class PyramidSIMPLEBLOBFeatureDetectorTest extends TestCase {
+public class PyramidSIMPLEBLOBFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSTARFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSTARFeatureDetectorTest.java
index ea826362e9..121235b140 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSTARFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSTARFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class PyramidSTARFeatureDetectorTest extends TestCase {
+public class PyramidSTARFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSURFFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSURFFeatureDetectorTest.java
index d212d0e2d8..4fe70ede31 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSURFFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSURFFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class PyramidSURFFeatureDetectorTest extends TestCase {
+public class PyramidSURFFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/SIFTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/SIFTFeatureDetectorTest.java
index dc381ca8db..6b02d7bf27 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/SIFTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/SIFTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class SIFTFeatureDetectorTest extends TestCase {
+public class SIFTFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/SIMPLEBLOBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/SIMPLEBLOBFeatureDetectorTest.java
index c27f8c3e18..98aca45bff 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/SIMPLEBLOBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/SIMPLEBLOBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;
 
-import junit.framework.TestCase;
+import org.opencv.test.OpenCVTestCase;
 
-public class SIMPLEBLOBFeatureDetectorTest extends TestCase {
+public class SIMPLEBLOBFeatureDetectorTest extends OpenCVTestCase {
 
     public void testCreate() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLPTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLPTest.java
index 709b631f86..f046d2daf3 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLPTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLPTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvANN_MLP;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvANN_MLPTest extends TestCase {
+public class CvANN_MLPTest extends OpenCVTestCase {
 
     public void testClear() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLP_TrainParamsTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLP_TrainParamsTest.java
index dd4a8f3598..7c5becaea5 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLP_TrainParamsTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLP_TrainParamsTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvANN_MLP_TrainParams;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvANN_MLP_TrainParamsTest extends TestCase {
+public class CvANN_MLP_TrainParamsTest extends OpenCVTestCase {
 
     public void testCvANN_MLP_TrainParams() {
         new CvANN_MLP_TrainParams();
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvBoostParamsTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvBoostParamsTest.java
index 3d815bcbc9..6cd92056da 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvBoostParamsTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvBoostParamsTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvBoostParams;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvBoostParamsTest extends TestCase {
+public class CvBoostParamsTest extends OpenCVTestCase {
 
     public void testCvBoostParams() {
         new CvBoostParams();
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvBoostTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvBoostTest.java
index 466d64a63a..9895c95f97 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvBoostTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvBoostTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvBoost;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvBoostTest extends TestCase {
+public class CvBoostTest extends OpenCVTestCase {
 
     public void testClear() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvDTreeParamsTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvDTreeParamsTest.java
index e767aaec28..c7bbda06fd 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvDTreeParamsTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvDTreeParamsTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvDTreeParams;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvDTreeParamsTest extends TestCase {
+public class CvDTreeParamsTest extends OpenCVTestCase {
 
     public void testCvDTreeParams() {
         new CvDTreeParams();
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvDTreeTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvDTreeTest.java
index f6a5baa60b..df6da726a9 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvDTreeTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvDTreeTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvDTree;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvDTreeTest extends TestCase {
+public class CvDTreeTest extends OpenCVTestCase {
 
     public void testClear() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvERTreesTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvERTreesTest.java
index 0a59dfec85..9b5e645526 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvERTreesTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvERTreesTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvERTrees;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvERTreesTest extends TestCase {
+public class CvERTreesTest extends OpenCVTestCase {
 
     public void testCvERTrees() {
         new CvERTrees();
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesParamsTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesParamsTest.java
index ca266d1b1c..ff6b54e647 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesParamsTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesParamsTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvGBTreesParams;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvGBTreesParamsTest extends TestCase {
+public class CvGBTreesParamsTest extends OpenCVTestCase {
 
     public void testCvGBTreesParams() {
         new CvGBTreesParams();
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesTest.java
index 2bbb38d450..e45b4ed3ee 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvGBTrees;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvGBTreesTest extends TestCase {
+public class CvGBTreesTest extends OpenCVTestCase {
 
     public void testClear() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvKNearestTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvKNearestTest.java
index 1f7bd37dde..46a2ca54b8 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvKNearestTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvKNearestTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvKNearest;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvKNearestTest extends TestCase {
+public class CvKNearestTest extends OpenCVTestCase {
 
     public void testCvKNearest() {
         new CvKNearest();
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvNormalBayesClassifierTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvNormalBayesClassifierTest.java
index d184a79235..ca818cd0a9 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvNormalBayesClassifierTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvNormalBayesClassifierTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvNormalBayesClassifier;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvNormalBayesClassifierTest extends TestCase {
+public class CvNormalBayesClassifierTest extends OpenCVTestCase {
 
     public void testClear() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvParamGridTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvParamGridTest.java
index 39334d15e0..09a1304cab 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvParamGridTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvParamGridTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvParamGrid;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvParamGridTest extends TestCase {
+public class CvParamGridTest extends OpenCVTestCase {
 
     public void testCvParamGrid() {
         new CvParamGrid();
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvRTParamsTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvRTParamsTest.java
index fb12e9a0e1..2b7ca4aecf 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvRTParamsTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvRTParamsTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvRTParams;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvRTParamsTest extends TestCase {
+public class CvRTParamsTest extends OpenCVTestCase {
 
     public void testCvRTParams() {
         new CvRTParams();
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvRTreesTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvRTreesTest.java
index dcb88eff08..d98a2796f9 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvRTreesTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvRTreesTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvRTrees;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvRTreesTest extends TestCase {
+public class CvRTreesTest extends OpenCVTestCase {
 
     public void testClear() {
         fail("Not yet implemented");
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvSVMParamsTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvSVMParamsTest.java
index a1b4c92100..c59f1ac5c3 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvSVMParamsTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvSVMParamsTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvSVMParams;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvSVMParamsTest extends TestCase {
+public class CvSVMParamsTest extends OpenCVTestCase {
 
     public void testCvSVMParams() {
         new CvSVMParams();
diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvSVMTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvSVMTest.java
index 4982ee85d9..7ea7dc32f6 100644
--- a/modules/java/android_test/src/org/opencv/test/ml/CvSVMTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvSVMTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;
 
 import org.opencv.ml.CvSVM;
+import org.opencv.test.OpenCVTestCase;
 
-import junit.framework.TestCase;
-
-public class CvSVMTest extends TestCase {
+public class CvSVMTest extends OpenCVTestCase {
 
     public void testClear() {
         fail("Not yet implemented");