diff --git a/jOOQ-examples/jOOQ-spring-example/src/test/java/org/jooq/example/QueryTest.java b/jOOQ-examples/jOOQ-spring-example/src/test/java/org/jooq/example/QueryTest.java
index 34860e9f5a..f3ba879203 100644
--- a/jOOQ-examples/jOOQ-spring-example/src/test/java/org/jooq/example/QueryTest.java
+++ b/jOOQ-examples/jOOQ-spring-example/src/test/java/org/jooq/example/QueryTest.java
@@ -41,12 +41,12 @@
 package org.jooq.example;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
 import static org.jooq.example.db.h2.Tables.AUTHOR;
 import static org.jooq.example.db.h2.Tables.BOOK;
 import static org.jooq.example.db.h2.Tables.BOOK_STORE;
 import static org.jooq.example.db.h2.Tables.BOOK_TO_BOOK_STORE;
 import static org.jooq.impl.DSL.countDistinct;
+import static org.junit.Assert.assertEquals;
 
 import org.jooq.DSLContext;
 import org.jooq.Record3;
diff --git a/jOOQ-examples/jOOQ-spring-example/src/test/java/org/jooq/example/TransactionTest.java b/jOOQ-examples/jOOQ-spring-example/src/test/java/org/jooq/example/TransactionTest.java
index 4cccdf150c..0e8ae81b9b 100644
--- a/jOOQ-examples/jOOQ-spring-example/src/test/java/org/jooq/example/TransactionTest.java
+++ b/jOOQ-examples/jOOQ-spring-example/src/test/java/org/jooq/example/TransactionTest.java
@@ -43,12 +43,12 @@ package org.jooq.example;
 import static org.jooq.example.db.h2.Tables.BOOK;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import junit.framework.Assert;
 
 import org.jooq.DSLContext;
 import org.jooq.example.spring.BookService;
 
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/jOOQ-test/src/org/jooq/test/BaseTest.java b/jOOQ-test/src/org/jooq/test/BaseTest.java
index afbacbd5e4..d7817cb0b8 100644
--- a/jOOQ-test/src/org/jooq/test/BaseTest.java
+++ b/jOOQ-test/src/org/jooq/test/BaseTest.java
@@ -40,7 +40,7 @@
  */
 package org.jooq.test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
@@ -57,8 +57,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.UUID;
 
-import junit.framework.Assert;
-
 import org.jooq.AggregateFunction;
 // ...
 import org.jooq.Configuration;
@@ -101,6 +99,8 @@ import org.jooq.types.UInteger;
 import org.jooq.types.ULong;
 import org.jooq.types.UShort;
 
+import org.junit.Assert;
+
 public abstract class BaseTest<
 
     // T_AUTHOR table
diff --git a/jOOQ-test/src/org/jooq/test/MariaDBTest.java b/jOOQ-test/src/org/jooq/test/MariaDBTest.java
index adee77354d..c9d3046b17 100644
--- a/jOOQ-test/src/org/jooq/test/MariaDBTest.java
+++ b/jOOQ-test/src/org/jooq/test/MariaDBTest.java
@@ -41,7 +41,6 @@
 
 package org.jooq.test;
 
-import static junit.framework.Assert.assertNull;
 import static org.jooq.impl.DSL.md5;
 import static org.jooq.impl.DSL.val;
 import static org.jooq.test.mariadb.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE;
@@ -65,6 +64,7 @@ import static org.jooq.util.mariadb.MariaDBDSL.uncompress;
 import static org.jooq.util.mariadb.MariaDBDSL.uncompressedLength;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/jOOQ-test/src/org/jooq/test/MySQLTest.java b/jOOQ-test/src/org/jooq/test/MySQLTest.java
index 93a6a03662..9b45c47af5 100644
--- a/jOOQ-test/src/org/jooq/test/MySQLTest.java
+++ b/jOOQ-test/src/org/jooq/test/MySQLTest.java
@@ -41,7 +41,6 @@
 
 package org.jooq.test;
 
-import static junit.framework.Assert.assertNull;
 import static org.jooq.impl.DSL.md5;
 import static org.jooq.impl.DSL.val;
 import static org.jooq.test.mysql.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE;
@@ -66,6 +65,7 @@ import static org.jooq.util.mysql.MySQLDSL.uncompress;
 import static org.jooq.util.mysql.MySQLDSL.uncompressedLength;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/jOOQ-test/src/org/jooq/test/OracleTest.java b/jOOQ-test/src/org/jooq/test/OracleTest.java
index 9093be1eca..c417854891 100644
--- a/jOOQ-test/src/org/jooq/test/OracleTest.java
+++ b/jOOQ-test/src/org/jooq/test/OracleTest.java
@@ -45,9 +45,6 @@ package org.jooq.test;
 
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -100,8 +97,11 @@ xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
 xxxxxx xxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxxxxxx
diff --git a/jOOQ-test/src/org/jooq/test/PostgresTest.java b/jOOQ-test/src/org/jooq/test/PostgresTest.java
index c0d8da7f9a..5faf873567 100644
--- a/jOOQ-test/src/org/jooq/test/PostgresTest.java
+++ b/jOOQ-test/src/org/jooq/test/PostgresTest.java
@@ -42,7 +42,6 @@
 package org.jooq.test;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
 import static org.jooq.impl.DSL.inline;
 import static org.jooq.impl.DSL.name;
 import static org.jooq.impl.DSL.select;
@@ -76,6 +75,7 @@ import static org.jooq.util.postgres.PostgresDSL.arrayPrepend;
 import static org.jooq.util.postgres.PostgresDSL.arrayToString;
 import static org.jooq.util.postgres.PostgresDSL.only;
 import static org.jooq.util.postgres.PostgresDSL.stringToArray;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 import java.math.BigDecimal;
diff --git a/jOOQ-test/src/org/jooq/test/SQLServerTest.java b/jOOQ-test/src/org/jooq/test/SQLServerTest.java
index 91cd6d197d..5d6f3767a5 100644
--- a/jOOQ-test/src/org/jooq/test/SQLServerTest.java
+++ b/jOOQ-test/src/org/jooq/test/SQLServerTest.java
@@ -44,7 +44,6 @@ package org.jooq.test;
 /* [pro] xx
 
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -72,6 +71,7 @@ xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxxxx
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java
index b402483b8d..4ccff6a829 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java
@@ -40,11 +40,11 @@
  */
 package org.jooq.test._.testcases;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
 // ...
 import static org.jooq.impl.DSL.count;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import java.sql.Date;
 import java.sql.SQLException;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
index 9ef5d197b2..3987424c34 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
@@ -42,8 +42,6 @@ package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.nCopies;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
 // ...
 // ...
 import static org.jooq.SQLDialect.CUBRID;
@@ -100,6 +98,8 @@ import static org.jooq.impl.DSL.sumDistinct;
 import static org.jooq.impl.DSL.val;
 import static org.jooq.impl.DSL.varPop;
 import static org.jooq.impl.DSL.varSamp;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.math.BigDecimal;
 import java.sql.Date;
@@ -258,14 +258,14 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         assertEquals(2, (int) result1.get(0).value2());
         assertEquals(2, (int) result1.get(0).value3());
         assertEquals(1, (int) result1.get(0).value4());
-        assertEquals(3d, result1.get(0).getValue(4, Double.class));
+        assertEquals(3d, result1.get(0).getValue(4, Double.class), 0.0);
         assertEquals(1, (int) result1.get(0).value7());
         assertEquals(2, (int) result1.get(0).value8());
 
         assertEquals(2, (int) result1.get(1).value2());
         assertEquals(2, (int) result1.get(1).value3());
         assertEquals(1, (int) result1.get(1).value4());
-        assertEquals(7d, result1.get(1).getValue(4, Double.class));
+        assertEquals(7d, result1.get(1).getValue(4, Double.class), 0.0);
         assertEquals(3, (int) result1.get(1).value7());
         assertEquals(4, (int) result1.get(1).value8());
 
@@ -316,17 +316,17 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
                     .orderBy(TBook_AUTHOR_ID())
                     .fetch();
 
-                assertEquals(0.5, result2.get(0).getValue(1, Double.class));
-                assertEquals(0.25, result2.get(0).getValue(3, Double.class));
-                assertEquals(0.5, result2.get(1).getValue(1, Double.class));
-                assertEquals(0.25, result2.get(1).getValue(3, Double.class));
+                assertEquals(0.5, result2.get(0).getValue(1, Double.class), 0.0);
+                assertEquals(0.25, result2.get(0).getValue(3, Double.class), 0.0);
+                assertEquals(0.5, result2.get(1).getValue(1, Double.class), 0.0);
+                assertEquals(0.25, result2.get(1).getValue(3, Double.class), 0.0);
 
                 // DB2 only knows STDDEV_POP / VAR_POP
                 if (true/* [pro] xx xx xxxxxxxxx xx xxxxxxxxxxxxxxxx [/pro] */) {
                     assertEquals("0.707", result2.get(0).getValue(2, String.class).substring(0, 5));
-                    assertEquals(0.5, result2.get(0).getValue(4, Double.class));
+                    assertEquals(0.5, result2.get(0).getValue(4, Double.class), 0.0);
                     assertEquals("0.707", result2.get(1).getValue(2, String.class).substring(0, 5));
-                    assertEquals(0.5, result2.get(1).getValue(4, Double.class));
+                    assertEquals(0.5, result2.get(1).getValue(4, Double.class), 0.0);
                 }
             }
         }
@@ -728,18 +728,18 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         // Overall STDDEV_POP(), STDDEV_SAMP(), VAR_POP(), VAR_SAMP()
         assertEquals("1.118", result.get(0).getValue(1, String.class).substring(0, 5));
-        assertEquals(1.25, result.get(0).getValue(3, Double.class));
+        assertEquals(1.25, result.get(0).getValue(3, Double.class), 0.0);
 
         // Partitioned STDDEV_POP(), STDDEV_SAMP(), VAR_POP(), VAR_SAMP()
-        assertEquals(0.5, result.get(0).getValue(5, Double.class));
-        assertEquals(0.25, result.get(0).getValue(7, Double.class));
+        assertEquals(0.5, result.get(0).getValue(5, Double.class), 0.0);
+        assertEquals(0.25, result.get(0).getValue(7, Double.class), 0.0);
 
         // DB2 only knows STDDEV_POP / VAR_POP
         if (true/* [pro] xx xx xxxxxxxxx xx xxxxxxxxxxxxxxxx [/pro] */) {
             assertEquals("1.290", result.get(0).getValue(2, String.class).substring(0, 5));
             assertEquals("1.666", result.get(0).getValue(4, String.class).substring(0, 5));
             assertEquals("0.707", result.get(0).getValue(6, String.class).substring(0, 5));
-            assertEquals(0.5, result.get(0).getValue(8, Double.class));
+            assertEquals(0.5, result.get(0).getValue(8, Double.class), 0.0);
         }
 
         // NTILE()
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/AliasTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/AliasTests.java
index 121c761e94..33070dc386 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/AliasTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/AliasTests.java
@@ -40,8 +40,6 @@
  */
 package org.jooq.test._.testcases;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
 import static org.jooq.impl.DSL.one;
 import static org.jooq.impl.DSL.select;
 import static org.jooq.impl.DSL.selectFrom;
@@ -51,6 +49,8 @@ import static org.jooq.impl.DSL.table;
 import static org.jooq.impl.DSL.two;
 import static org.jooq.impl.DSL.val;
 import static org.jooq.impl.DSL.zero;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import java.sql.Date;
 import java.util.List;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/BatchTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/BatchTests.java
index 74bab67684..4cc2431b84 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/BatchTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/BatchTests.java
@@ -41,12 +41,12 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.fail;
 import static org.jooq.impl.DSL.delete;
 import static org.jooq.impl.DSL.insertInto;
 import static org.jooq.impl.DSL.selectOne;
 import static org.jooq.tools.reflect.Reflect.on;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.sql.Connection;
 import java.sql.Date;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java
index 2dda817d75..41fd7385ce 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java
@@ -41,17 +41,17 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
 // ...
 // ...
 import static org.jooq.SQLDialect.SQLITE;
 import static org.jooq.impl.DSL.count;
 import static org.jooq.impl.DSL.table;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.sql.Date;
 import java.sql.Timestamp;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/DaoTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/DaoTests.java
index 90700c43aa..8b72db5217 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/DaoTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/DaoTests.java
@@ -41,10 +41,10 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
 import static org.jooq.tools.reflect.Reflect.on;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Date;
 import java.util.ArrayList;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
index 0793259d8e..6176d06da0 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
@@ -41,10 +41,6 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
 // ...
 // ...
 import static org.jooq.SQLDialect.CUBRID;
@@ -73,6 +69,10 @@ import static org.jooq.types.Unsigned.ubyte;
 import static org.jooq.types.Unsigned.uint;
 import static org.jooq.types.Unsigned.ulong;
 import static org.jooq.types.Unsigned.ushort;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -776,10 +776,10 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             create().selectFrom(TAuthor()).orderBy(TAuthor_ID()).limit(1).fetchOne(0, ULong.class));
         assertEquals(
             1.0f,
-            create().selectFrom(TAuthor()).orderBy(TAuthor_ID()).limit(1).fetchOne(0, Float.class));
+            create().selectFrom(TAuthor()).orderBy(TAuthor_ID()).limit(1).fetchOne(0, Float.class), 0.0f);
         assertEquals(
             1.0,
-            create().selectFrom(TAuthor()).orderBy(TAuthor_ID()).limit(1).fetchOne(0, Double.class));
+            create().selectFrom(TAuthor()).orderBy(TAuthor_ID()).limit(1).fetchOne(0, Double.class), 0.0);
         assertEquals(
             new BigInteger("1"),
             create().selectFrom(TAuthor()).orderBy(TAuthor_ID()).limit(1).fetchOne(0, BigInteger.class));
@@ -814,10 +814,10 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             create().selectFrom(TAuthor()).orderBy(TAuthor_ID()).limit(1).fetchOne(TAuthor_ID().getName(), ULong.class));
         assertEquals(
             1.0f,
-            create().selectFrom(TAuthor()).orderBy(TAuthor_ID()).limit(1).fetchOne(TAuthor_ID().getName(), Float.class));
+            create().selectFrom(TAuthor()).orderBy(TAuthor_ID()).limit(1).fetchOne(TAuthor_ID().getName(), Float.class), 0.0f);
         assertEquals(
             1.0,
-            create().selectFrom(TAuthor()).orderBy(TAuthor_ID()).limit(1).fetchOne(TAuthor_ID().getName(), Double.class));
+            create().selectFrom(TAuthor()).orderBy(TAuthor_ID()).limit(1).fetchOne(TAuthor_ID().getName(), Double.class), 0.0);
         assertEquals(
             new BigInteger("1"),
             create().selectFrom(TAuthor()).orderBy(TAuthor_ID()).limit(1).fetchOne(TAuthor_ID().getName(), BigInteger.class));
@@ -1322,8 +1322,8 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         if (T639_BIG_INTEGER() != null) assertEquals(new BigInteger("1234567890"), record.getValue(T639_BIG_INTEGER()));
         if (T639_BYTE() != null) assertEquals(9, (byte) record.getValue(T639_BYTE()));
-        if (T639_DOUBLE() != null) assertEquals(10.125, (double) record.getValue(T639_DOUBLE()));
-        if (T639_FLOAT() != null) assertEquals(11.375f, (float) record.getValue(T639_FLOAT()));
+        if (T639_DOUBLE() != null) assertEquals(10.125, record.getValue(T639_DOUBLE()), 0.0);
+        if (T639_FLOAT() != null) assertEquals(11.375f, record.getValue(T639_FLOAT()), 0.0f);
 
         // Various BigDecimal tests
         // ------------------------
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java
index 7a58aebbdd..c3a2e75921 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java
@@ -40,8 +40,8 @@
  */
 package org.jooq.test._.testcases;
 
-import static junit.framework.Assert.assertEquals;
 import static org.jooq.tools.reflect.Reflect.on;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java
index 5ac5b15dc8..8277c13318 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java
@@ -41,16 +41,16 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
 import static org.jooq.conf.SettingsTools.executePreparedStatements;
 import static org.jooq.impl.DSL.falseCondition;
 import static org.jooq.impl.DSL.param;
 import static org.jooq.impl.DSL.val;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.sql.Date;
 import java.util.ArrayList;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java
index 14d291f00b..05f1402a76 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java
@@ -41,8 +41,6 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
 import static org.jooq.impl.DSL.avg;
 import static org.jooq.impl.DSL.connectByIsCycle;
 import static org.jooq.impl.DSL.connectByIsLeaf;
@@ -64,6 +62,8 @@ import static org.jooq.impl.DSL.table;
 import static org.jooq.impl.DSL.trueCondition;
 import static org.jooq.impl.DSL.two;
 import static org.jooq.impl.DSL.val;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Date;
 import java.util.Arrays;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
index cb0cff10e8..bdd345d90e 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
@@ -41,12 +41,6 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
 // ...
 import static org.jooq.SQLDialect.H2;
 // ...
@@ -57,6 +51,12 @@ import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.DSL.selectOne;
 import static org.jooq.impl.DSL.val;
 import static org.jooq.tools.reflect.Reflect.on;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.math.BigDecimal;
 import java.sql.Date;
@@ -76,8 +76,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Queue;
 
-import junit.framework.Assert;
-
 import org.jooq.AttachableInternal;
 import org.jooq.Cursor;
 import org.jooq.DSLContext;
@@ -124,6 +122,7 @@ import org.jooq.test._.StaticWithAnnotations;
 import org.jooq.test._.StaticWithoutAnnotations;
 import org.jooq.tools.jdbc.JDBCUtils;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class FetchTests<
@@ -1992,8 +1991,8 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         assertEquals((byte) 4, rs.getByte(1));
         assertEquals((short) 4, rs.getShort(1));
         assertEquals(4L, rs.getLong(1));
-        assertEquals(4.0f, rs.getFloat(1));
-        assertEquals(4.0, rs.getDouble(1));
+        assertEquals(4.0f, rs.getFloat(1), 0.0f);
+        assertEquals(4.0, rs.getDouble(1), 0.0);
         assertEquals(new BigDecimal("4"), rs.getBigDecimal(1));
 
         assertEquals(0, rs.getInt(3));
@@ -2031,8 +2030,8 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         assertEquals((byte) 1, rs.getByte(1));
         assertEquals((short) 1, rs.getShort(1));
         assertEquals(1L, rs.getLong(1));
-        assertEquals(1.0f, rs.getFloat(1));
-        assertEquals(1.0, rs.getDouble(1));
+        assertEquals(1.0f, rs.getFloat(1), 0.0f);
+        assertEquals(1.0, rs.getDouble(1), 0.0);
         assertEquals(BigDecimal.ONE, rs.getBigDecimal(1));
 
         assertEquals(0, rs.getInt(3));
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java
index 38fb612979..8e91e7030b 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java
@@ -41,9 +41,9 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
 import static org.jooq.tools.StringUtils.defaultString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
index df9b854ed3..6ca56eaed7 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
@@ -41,9 +41,6 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
 // ...
 // ...
 // ...
@@ -132,6 +129,9 @@ import static org.jooq.impl.DSL.trunc;
 import static org.jooq.impl.DSL.upper;
 import static org.jooq.impl.DSL.val;
 import static org.jooq.impl.DSL.year;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.math.BigDecimal;
 import java.sql.Date;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
index 9796911d8a..8fe02925c2 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
@@ -41,11 +41,6 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.fail;
 import static org.jooq.impl.DSL.castNull;
 import static org.jooq.impl.DSL.count;
 import static org.jooq.impl.DSL.deg;
@@ -57,6 +52,11 @@ import static org.jooq.impl.DSL.trim;
 import static org.jooq.impl.DSL.two;
 import static org.jooq.impl.DSL.val;
 import static org.jooq.impl.DSL.zero;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java
index f8da811a8a..6043d946d9 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java
@@ -41,7 +41,6 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
 // ...
 import static org.jooq.SQLDialect.MARIADB;
 import static org.jooq.SQLDialect.MYSQL;
@@ -54,6 +53,7 @@ import static org.jooq.impl.DSL.count;
 import static org.jooq.impl.DSL.one;
 import static org.jooq.impl.DSL.rollup;
 import static org.jooq.impl.DSL.selectOne;
+import static org.junit.Assert.assertEquals;
 
 import java.sql.Date;
 import java.util.Arrays;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
index 13563c86a6..815207bc89 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
@@ -41,9 +41,6 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
 // ...
 // ...
 import static org.jooq.SQLDialect.CUBRID;
@@ -74,6 +71,9 @@ import static org.jooq.impl.DSL.selectOne;
 import static org.jooq.impl.DSL.tableByName;
 import static org.jooq.impl.DSL.trueCondition;
 import static org.jooq.impl.DSL.val;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
index a63be7a320..c2433f4dba 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
@@ -41,8 +41,6 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
 // ...
 import static org.jooq.SQLDialect.CUBRID;
 // ...
@@ -60,7 +58,9 @@ import static org.jooq.impl.DSL.select;
 import static org.jooq.impl.DSL.selectOne;
 import static org.jooq.impl.DSL.val;
 import static org.jooq.impl.DSL.zero;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.sql.Date;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java
index 7fea45b99e..763d3841fc 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java
@@ -41,16 +41,16 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
 // ...
 import static org.jooq.SQLDialect.CUBRID;
 // ...
 import static org.jooq.SQLDialect.H2;
 // ...
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java
index 4b944d5b6d..8cadacd7e2 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java
@@ -41,8 +41,6 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
 // ...
 // ...
 // ...
@@ -53,6 +51,8 @@ import static org.jooq.impl.DSL.lower;
 import static org.jooq.impl.DSL.param;
 import static org.jooq.impl.DSL.table;
 import static org.jooq.impl.DSL.val;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import java.sql.Date;
 import java.util.Arrays;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
index cba0e86903..7cafbcdedd 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
@@ -41,10 +41,6 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
 import static org.jooq.conf.ParamType.INDEXED;
@@ -59,6 +55,10 @@ import static org.jooq.impl.DSL.param;
 import static org.jooq.impl.DSL.table;
 import static org.jooq.impl.DSL.tableByName;
 import static org.jooq.impl.DSL.val;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Date;
 import java.sql.SQLException;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java
index a85267dc65..21acf499db 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java
@@ -41,7 +41,6 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
 // ...
 // ...
 // ...
@@ -65,6 +64,7 @@ import static org.jooq.impl.DSL.trueCondition;
 import static org.jooq.impl.DSL.upper;
 import static org.jooq.impl.DSL.val;
 import static org.jooq.impl.DSL.zero;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RecordTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RecordTests.java
index d2e1adbd7a..214e69cd49 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RecordTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RecordTests.java
@@ -40,9 +40,9 @@
  */
 package org.jooq.test._.testcases;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Date;
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ReferentialTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ReferentialTests.java
index f929841dcb..10eab1e80f 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ReferentialTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ReferentialTests.java
@@ -41,8 +41,8 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import java.sql.Date;
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java
index a139d06d80..afabed4fe9 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java
@@ -41,17 +41,17 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.conf.SettingsTools.executePreparedStatements;
 import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.DSL.inline;
 import static org.jooq.impl.DSL.param;
 import static org.jooq.impl.DSL.val;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ResultSetTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ResultSetTests.java
index d088e0e9d7..775dd29031 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ResultSetTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ResultSetTests.java
@@ -41,9 +41,9 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
 import static org.jooq.SQLDialect.SQLITE;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Date;
 import java.sql.ResultSet;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ResultTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ResultTests.java
index 434be0cd2c..f50428cd24 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ResultTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ResultTests.java
@@ -41,8 +41,8 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Date;
 import java.util.Comparator;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java
index 89043e3c7b..5b5ff33704 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java
@@ -41,15 +41,15 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
 // ...
 import static org.jooq.impl.DSL.table;
 import static org.jooq.impl.DSL.val;
 import static org.jooq.tools.reflect.Reflect.on;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Date;
 import java.util.Arrays;
@@ -504,12 +504,12 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
             // First record: null
             // -----------------------------------------------------------------
-            assertEquals(null, arrays.getValue(0, TArrays_STRING()));
-            assertEquals(null, arrays.getValue(0, TArrays_NUMBER()));
-            assertEquals(null, arrays.getValue(0, TArrays_DATE()));
+            assertNull(arrays.getValue(0, TArrays_STRING()));
+            assertNull(arrays.getValue(0, TArrays_NUMBER()));
+            assertNull(arrays.getValue(0, TArrays_DATE()));
 
             if (TArrays_UDT() != null) {
-                assertEquals(null, arrays.getValue(0, TArrays_UDT()));
+                assertNull(arrays.getValue(0, TArrays_UDT()));
             }
 
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RowValueExpressionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RowValueExpressionTests.java
index 528b634e35..b58de0c200 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RowValueExpressionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RowValueExpressionTests.java
@@ -41,7 +41,6 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
 // ...
 import static org.jooq.impl.DSL.currentDate;
 import static org.jooq.impl.DSL.inline;
@@ -52,6 +51,7 @@ import static org.jooq.impl.DSL.select;
 import static org.jooq.impl.DSL.trueCondition;
 import static org.jooq.impl.DSL.val;
 import static org.jooq.impl.DSL.zero;
+import static org.junit.Assert.assertEquals;
 
 import java.sql.Date;
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
index 91e59d6e71..b74f54602e 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
@@ -42,10 +42,10 @@ package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.nCopies;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
 import static org.jooq.impl.DSL.sum;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.math.BigDecimal;
 import java.sql.Date;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java
index be0251438a..87bc4f70c1 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java
@@ -41,8 +41,6 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
 // ...
 import static org.jooq.impl.DSL.count;
 import static org.jooq.impl.DSL.select;
@@ -50,6 +48,8 @@ import static org.jooq.impl.DSL.selectOne;
 import static org.jooq.impl.DSL.selectZero;
 import static org.jooq.impl.DSL.trim;
 import static org.jooq.impl.DSL.val;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Date;
 import java.util.Vector;
@@ -129,7 +129,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         assertTrue(asList(result.get(0).fields()).contains(f3));
 
         assertEquals(Integer.valueOf(1), result.get(0).getValue(f1));
-        assertEquals(2d, result.get(0).getValue(f2));
+        assertEquals(2d, result.get(0).getValue(f2), 0.0);
         assertEquals("test", result.get(0).getValue(f3));
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java
index 0fa88fa479..1386b2c191 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java
@@ -40,13 +40,13 @@
  */
 package org.jooq.test._.testcases;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
 import static org.jooq.SQLDialect.H2;
 import static org.jooq.impl.DSL.inline;
 import static org.jooq.impl.DSL.val;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/TableFunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/TableFunctionTests.java
index ad0f3c3abd..eccfe7d1ce 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/TableFunctionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/TableFunctionTests.java
@@ -41,7 +41,6 @@
 package org.jooq.test._.testcases;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
 import static org.jooq.SQLDialect.CUBRID;
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
@@ -49,6 +48,7 @@ import static org.jooq.impl.DSL.dual;
 import static org.jooq.impl.DSL.generateSeries;
 import static org.jooq.impl.DSL.one;
 import static org.jooq.impl.DSL.selectOne;
+import static org.junit.Assert.assertEquals;
 
 import java.sql.Date;
 import java.util.List;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ThreadSafetyTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ThreadSafetyTests.java
index e062d9cbef..457725363a 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ThreadSafetyTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ThreadSafetyTests.java
@@ -40,8 +40,8 @@
  */
 package org.jooq.test._.testcases;
 
-import static junit.framework.Assert.assertEquals;
 import static org.jooq.SQLDialect.FIREBIRD;
+import static org.junit.Assert.assertEquals;
 
 import java.sql.Date;
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/TruncateTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/TruncateTests.java
index 3119522412..17a8b989a3 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/TruncateTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/TruncateTests.java
@@ -40,12 +40,12 @@
  */
 package org.jooq.test._.testcases;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.fail;
 import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.FIREBIRD;
 // ...
 import static org.jooq.SQLDialect.SQLITE;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.sql.Date;
 import java.util.Arrays;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ValuesConstructorTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ValuesConstructorTests.java
index b7eea382f6..9191be5b60 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ValuesConstructorTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ValuesConstructorTests.java
@@ -40,10 +40,10 @@
  */
 package org.jooq.test._.testcases;
 
-import static junit.framework.Assert.assertEquals;
 import static org.jooq.impl.DSL.row;
 import static org.jooq.impl.DSL.table;
 import static org.jooq.impl.DSL.values;
+import static org.junit.Assert.assertEquals;
 
 import java.sql.Date;
 
diff --git a/jOOQ-test/src/org/jooq/test/_/tools/DOMBuilder.java b/jOOQ-test/src/org/jooq/test/_/tools/DOMBuilder.java
index 8af4d3332f..ec618f1515 100644
--- a/jOOQ-test/src/org/jooq/test/_/tools/DOMBuilder.java
+++ b/jOOQ-test/src/org/jooq/test/_/tools/DOMBuilder.java
@@ -23,13 +23,12 @@ package org.jooq.test._.tools;
 import java.util.Stack;
 import java.util.Vector;
 
+import org.w3c.dom.CDATASection;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.Text;
-import org.w3c.dom.CDATASection;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml
index df4c5a26e1..5f58f01a44 100644
--- a/jOOQ/pom.xml
+++ b/jOOQ/pom.xml
@@ -201,14 +201,14 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <version>4.11</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock-junit4</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.0</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
diff --git a/jOOQ/src/test/java/org/jooq/test/AbstractTest.java b/jOOQ/src/test/java/org/jooq/test/AbstractTest.java
index bbfab76b14..dd12d80f5b 100644
--- a/jOOQ/src/test/java/org/jooq/test/AbstractTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/AbstractTest.java
@@ -51,7 +51,7 @@ import java.sql.PreparedStatement;
 import java.sql.Time;
 import java.sql.Timestamp;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.jooq.BindContext;
 import org.jooq.Constants;
diff --git a/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java b/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java
index e71011f378..6616bffc35 100644
--- a/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java
@@ -41,7 +41,7 @@
 
 package org.jooq.test;
 
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
 import static org.jooq.impl.DSL.fieldByName;
 import static org.jooq.impl.DSL.val;
 
diff --git a/jOOQ/src/test/java/org/jooq/test/MockTest.java b/jOOQ/src/test/java/org/jooq/test/MockTest.java
index 118618fc70..e7beb8d17d 100644
--- a/jOOQ/src/test/java/org/jooq/test/MockTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/MockTest.java
@@ -41,8 +41,8 @@
 package org.jooq.test;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
 import static org.jooq.impl.DSL.val;
 import static org.jooq.test.data.Table1.FIELD_ID1;
 import static org.jooq.test.data.Table1.FIELD_NAME1;
diff --git a/jOOQ/src/test/java/org/jooq/test/RecordMappingTest.java b/jOOQ/src/test/java/org/jooq/test/RecordMappingTest.java
index 7569533109..270be1bbf0 100644
--- a/jOOQ/src/test/java/org/jooq/test/RecordMappingTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/RecordMappingTest.java
@@ -41,7 +41,7 @@
 
 package org.jooq.test;
 
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
 import static org.jooq.impl.DSL.field;
 
 import javax.persistence.Column;
diff --git a/jOOQ/src/test/java/org/jooq/test/RecordTest.java b/jOOQ/src/test/java/org/jooq/test/RecordTest.java
index 3cf14ad69a..22a4376290 100644
--- a/jOOQ/src/test/java/org/jooq/test/RecordTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/RecordTest.java
@@ -41,7 +41,7 @@
 
 package org.jooq.test;
 
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.fail;
 
 import org.jooq.test.data.Table1;
 import org.jooq.test.data.Table1Record;
diff --git a/jOOQ/src/test/java/org/jooq/test/VisitContextTest.java b/jOOQ/src/test/java/org/jooq/test/VisitContextTest.java
index 1cdb7ed5fc..4057a058a0 100644
--- a/jOOQ/src/test/java/org/jooq/test/VisitContextTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/VisitContextTest.java
@@ -41,7 +41,7 @@
 package org.jooq.test;
 
 import static java.util.Arrays.asList;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.fail;
 import static org.jooq.Clause.CONDITION;
 import static org.jooq.Clause.CONDITION_AND;
 import static org.jooq.Clause.CONDITION_BETWEEN;