diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionDriverTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionDriverTest.java
new file mode 100644
index 0000000..5cce2f6
--- /dev/null
+++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionDriverTest.java
@@ -0,0 +1,38 @@
+package connection.producer;
+
+import java.sql.Connection;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import test.Tests;
+import br.gov.frameworkdemoiselle.annotation.Name;
+
+@RunWith(Arquillian.class)
+public class ConnectionProducerNoConnectionDriverTest {
+
+	private static String PATH = "src/test/resources/producer/no-connection-driver";
+
+	@Inject
+	@Name("conn1")
+	private Instance<Connection> conn1;
+
+	@Deployment
+	public static WebArchive createDeployment() {
+		WebArchive deployment = Tests.createDeployment(ConnectionProducerNoConnectionDriverTest.class);
+		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
+		return deployment;
+	}
+
+	@Test(expected = Exception.class)
+	public void failOnCreateConnection() {
+		conn1.get();
+	}
+
+}
diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionTest.java
deleted file mode 100644
index 8a26969..0000000
--- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package connection.producer;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import test.Tests;
-import br.gov.frameworkdemoiselle.DemoiselleException;
-import br.gov.frameworkdemoiselle.annotation.Name;
-
-@RunWith(Arquillian.class)
-public class ConnectionProducerNoConnectionTest {
-
-	private static String PATH = "src/test/resources/producer/no-connection";
-
-	@Inject
-	@Name("conn1")
-	private Instance<Connection> conn1;
-
-	@Deployment
-	public static WebArchive createDeployment() {
-		WebArchive deployment = Tests.createDeployment(ConnectionProducerNoConnectionTest.class);
-		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
-		return deployment;
-	}
-
-	@Test(expected = DemoiselleException.class)
-	public void failOnCreateConnection() throws SQLException {
-		String url = ((Connection)conn1).getMetaData().getURL();
-	}
-
-}
diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionUrlTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionUrlTest.java
new file mode 100644
index 0000000..54e1f73
--- /dev/null
+++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionUrlTest.java
@@ -0,0 +1,38 @@
+package connection.producer;
+
+import java.sql.Connection;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import test.Tests;
+import br.gov.frameworkdemoiselle.annotation.Name;
+
+@RunWith(Arquillian.class)
+public class ConnectionProducerNoConnectionUrlTest {
+
+	private static String PATH = "src/test/resources/producer/no-connection-url";
+
+	@Inject
+	@Name("conn1")
+	private Instance<Connection> conn1;
+
+	@Deployment
+	public static WebArchive createDeployment() {
+		WebArchive deployment = Tests.createDeployment(ConnectionProducerNoConnectionUrlTest.class);
+		deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");
+		return deployment;
+	}
+
+	@Test(expected = Exception.class)
+	public void failOnCreateConnection() {
+		conn1.get();
+	}
+
+}
diff --git a/impl/extension/jdbc/src/test/resources/producer/no-connection-driver/demoiselle.properties b/impl/extension/jdbc/src/test/resources/producer/no-connection-driver/demoiselle.properties
new file mode 100644
index 0000000..446413f
--- /dev/null
+++ b/impl/extension/jdbc/src/test/resources/producer/no-connection-driver/demoiselle.properties
@@ -0,0 +1,3 @@
+frameworkdemoiselle.persistence.conn1.url=jdbc:hsqldb:hsql5
+frameworkdemoiselle.persistence.conn1.username=sa
+frameworkdemoiselle.persistence.conn1.password=
\ No newline at end of file
diff --git a/impl/extension/jdbc/src/test/resources/producer/no-connection-url/demoiselle.properties b/impl/extension/jdbc/src/test/resources/producer/no-connection-url/demoiselle.properties
new file mode 100644
index 0000000..e95db1a
--- /dev/null
+++ b/impl/extension/jdbc/src/test/resources/producer/no-connection-url/demoiselle.properties
@@ -0,0 +1,3 @@
+frameworkdemoiselle.persistence.conn1.driver.class=org.hsqldb.jdbcDriver
+frameworkdemoiselle.persistence.conn1.username=sa
+frameworkdemoiselle.persistence.conn1.password=
\ No newline at end of file
diff --git a/impl/extension/jdbc/src/test/resources/producer/no-connection/demoiselle.properties b/impl/extension/jdbc/src/test/resources/producer/no-connection/demoiselle.properties
deleted file mode 100644
index a356c42..0000000
--- a/impl/extension/jdbc/src/test/resources/producer/no-connection/demoiselle.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-frameworkdemoiselle.persistence.conn1.driver.class=
-frameworkdemoiselle.persistence.conn1.url=jdbc:hsqldb:hsql5
-frameworkdemoiselle.persistence.conn1.username=sa
-frameworkdemoiselle.persistence.conn1.password=
\ No newline at end of file
--
libgit2 0.21.2