diff --git a/querydsl-sql/src/test/java/com/mysema/query/Connections.java b/querydsl-sql/src/test/java/com/mysema/query/Connections.java
index 5361471a9..1142b77f7 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/Connections.java
+++ b/querydsl-sql/src/test/java/com/mysema/query/Connections.java
@@ -22,7 +22,6 @@ public final class Connections {
     private static final String INSERT_INTO_EMPLOYEE = "insert into employee2 " +
         "(id, firstname, lastname, salary, datefield, timefield, superior_id) " +
         "values (?,?,?,?,?,?,?)";
-
     
     private static ThreadLocal<Connection> connHolder = new ThreadLocal<Connection>();
 
diff --git a/querydsl-sql/src/test/java/com/mysema/query/Constants.java b/querydsl-sql/src/test/java/com/mysema/query/Constants.java
index 601377a60..01f4386dd 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/Constants.java
+++ b/querydsl-sql/src/test/java/com/mysema/query/Constants.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2009 Mysema Ltd.
+ * All rights reserved.
+ * 
+ */
 package com.mysema.query;
 
 import java.util.Calendar;
diff --git a/querydsl-sql/src/test/java/com/mysema/query/DeleteBaseTest.java b/querydsl-sql/src/test/java/com/mysema/query/DeleteBaseTest.java
index 60f4922a0..690013a42 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/DeleteBaseTest.java
+++ b/querydsl-sql/src/test/java/com/mysema/query/DeleteBaseTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2009 Mysema Ltd.
+ * All rights reserved.
+ * 
+ */
 package com.mysema.query;
 
 import static com.mysema.query.Target.MYSQL;
@@ -21,7 +26,7 @@ public abstract class DeleteBaseTest extends AbstractBaseTest{
     
     @Test
     @ExcludeIn(MYSQL)
-    public void testDelete() throws SQLException{
+    public void delete() throws SQLException{
         try{
             // TODO : FIXME
             long count = query().from(survey).count();
diff --git a/querydsl-sql/src/test/java/com/mysema/query/DeleteDerbyTest.java b/querydsl-sql/src/test/java/com/mysema/query/DeleteDerbyTest.java
new file mode 100644
index 000000000..dc32ff797
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/mysema/query/DeleteDerbyTest.java
@@ -0,0 +1,25 @@
+package com.mysema.query;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+
+import com.mysema.query.sql.DerbyTemplates;
+import com.mysema.testutil.FilteringTestRunner;
+import com.mysema.testutil.Label;
+
+@RunWith(FilteringTestRunner.class)
+@Label(Target.DERBY)
+public class DeleteDerbyTest extends DeleteBaseTest{
+    
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initDerby();
+    }
+
+    @Before
+    public void setUpForTest() {
+        dialect = new DerbyTemplates().newLineToSingleSpace();
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/InsertBaseTest.java b/querydsl-sql/src/test/java/com/mysema/query/InsertBaseTest.java
index 3b38f15f1..e4f447359 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/InsertBaseTest.java
+++ b/querydsl-sql/src/test/java/com/mysema/query/InsertBaseTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2009 Mysema Ltd.
+ * All rights reserved.
+ * 
+ */
 package com.mysema.query;
 
 import static com.mysema.query.Connections.getConnection;
@@ -16,7 +21,7 @@ public abstract class InsertBaseTest extends AbstractBaseTest{
     }
     
     @Test
-    public void testInsert(){
+    public void insert(){
 //        create table survey (id int,name varchar(30))
         
         // with columns
diff --git a/querydsl-sql/src/test/java/com/mysema/query/InsertDerbyTest.java b/querydsl-sql/src/test/java/com/mysema/query/InsertDerbyTest.java
new file mode 100644
index 000000000..98991413a
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/mysema/query/InsertDerbyTest.java
@@ -0,0 +1,25 @@
+package com.mysema.query;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+
+import com.mysema.query.sql.DerbyTemplates;
+import com.mysema.testutil.FilteringTestRunner;
+import com.mysema.testutil.Label;
+
+@RunWith(FilteringTestRunner.class)
+@Label(Target.DERBY)
+public class InsertDerbyTest extends InsertBaseTest{
+    
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initDerby();
+    }
+
+    @Before
+    public void setUpForTest() {
+        dialect = new DerbyTemplates().newLineToSingleSpace();
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/SelectBaseTest.java b/querydsl-sql/src/test/java/com/mysema/query/SelectBaseTest.java
index 62b5da00a..38ec5a2ba 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/SelectBaseTest.java
+++ b/querydsl-sql/src/test/java/com/mysema/query/SelectBaseTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2009 Mysema Ltd.
+ * All rights reserved.
+ * 
+ */
 package com.mysema.query;
 
 import static com.mysema.query.Target.DERBY;
diff --git a/querydsl-sql/src/test/java/com/mysema/query/UpdateBaseTest.java b/querydsl-sql/src/test/java/com/mysema/query/UpdateBaseTest.java
index 8009a7926..ebebf092e 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/UpdateBaseTest.java
+++ b/querydsl-sql/src/test/java/com/mysema/query/UpdateBaseTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2009 Mysema Ltd.
+ * All rights reserved.
+ * 
+ */
 package com.mysema.query;
 
 import static org.junit.Assert.assertEquals;
diff --git a/querydsl-sql/src/test/java/com/mysema/query/UpdateDerbyTest.java b/querydsl-sql/src/test/java/com/mysema/query/UpdateDerbyTest.java
new file mode 100644
index 000000000..d156f07bb
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/mysema/query/UpdateDerbyTest.java
@@ -0,0 +1,25 @@
+package com.mysema.query;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+
+import com.mysema.query.sql.DerbyTemplates;
+import com.mysema.testutil.FilteringTestRunner;
+import com.mysema.testutil.Label;
+
+@RunWith(FilteringTestRunner.class)
+@Label(Target.DERBY)
+public class UpdateDerbyTest extends UpdateBaseTest{
+    
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initDerby();
+    }
+
+    @Before
+    public void setUpForTest() {
+        dialect = new DerbyTemplates().newLineToSingleSpace();
+    }
+
+}