diff --git a/impl/extension/jdbc/src/test/java/test/Tests.java b/impl/extension/jdbc/src/test/java/test/Tests.java
index 3c8e26f..69e6c38 100644
--- a/impl/extension/jdbc/src/test/java/test/Tests.java
+++ b/impl/extension/jdbc/src/test/java/test/Tests.java
@@ -67,7 +67,7 @@ public final class Tests {
 
 	private static WebArchive createDeployment() {
 		File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml", "arquillian-test")
-				.importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile();
+				.importCompileAndRuntimeDependencies().importTestDependencies().resolve().withTransitivity().asFile();
 
 		return ShrinkWrap
 				.create(WebArchive.class)
diff --git a/impl/extension/jdbc/src/test/resources/arquillian.xml b/impl/extension/jdbc/src/test/resources/arquillian.xml
index b5fb9f7..775e12e 100644
--- a/impl/extension/jdbc/src/test/resources/arquillian.xml
+++ b/impl/extension/jdbc/src/test/resources/arquillian.xml
@@ -43,11 +43,18 @@
 		<property name="deploymentExportPath">target/deployments</property>
 	</engine>
 
+	<!--
 	<container qualifier="jbossas-managed" default="true">
 		<protocol type="Servlet 3.0" />
 		<configuration>
 			<property name="jbossHome">target/jboss-as-${jboss.as.version}</property>
 		</configuration>
 	</container>
+	-->
 
+	<container qualifier="glassfish-embedded" default="true">
+		<configuration>
+			<property name="resourcesXml">src/test/resources/glassfish-resources.xml</property>
+		</configuration>
+	</container>
 </arquillian>
\ No newline at end of file
diff --git a/impl/extension/jdbc/src/test/resources/glassfish-resources.xml b/impl/extension/jdbc/src/test/resources/glassfish-resources.xml
new file mode 100644
index 0000000..9b60b35
--- /dev/null
+++ b/impl/extension/jdbc/src/test/resources/glassfish-resources.xml
@@ -0,0 +1,48 @@
+<!--
+ Demoiselle Framework
+ Copyright (C) 2010 SERPRO
+ ============================================================================
+ This file is part of Demoiselle Framework.
+ 
+ Demoiselle Framework is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public License version 3
+ along with this program; if not,  see <http://www.gnu.org/licenses />
+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA  02110-1301, USA.
+ ============================================================================
+ Este arquivo é parte do Framework Demoiselle.
+ 
+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ do Software Livre (FSF).
+ 
+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ para maiores detalhes.
+ 
+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses />
+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+-->
+<!DOCTYPE resources PUBLIC
+    "-//GlassFish.org//DTD GlassFish Application Server 3.1 Resource Definitions//EN"
+    "http://glassfish.org/dtds/glassfish-resources_1_5.dtd">
+<resources>
+	<jdbc-resource pool-name="ArquillianEmbeddedDerbyPool" jndi-name="jboss/datasources/ExampleDS" />
+
+	<jdbc-connection-pool name="ArquillianEmbeddedDerbyPool" res-type="javax.sql.DataSource" datasource-classname="org.apache.derby.jdbc.EmbeddedDataSource"
+		is-isolation-level-guaranteed="false">
+		<property name="databaseName" value="target/databases/derby" />
+		<property name="createDatabase" value="create" />
+	</jdbc-connection-pool>
+</resources>
\ No newline at end of file
diff --git a/impl/extension/jpa/src/test/resources/arquillian.xml b/impl/extension/jpa/src/test/resources/arquillian.xml
index b3989a0..ab3823f 100644
--- a/impl/extension/jpa/src/test/resources/arquillian.xml
+++ b/impl/extension/jpa/src/test/resources/arquillian.xml
@@ -43,11 +43,18 @@
 		<property name="deploymentExportPath">target/deployments</property>
 	</engine>
 
+	<!--
 	<container qualifier="jbossas-managed" default="true">
 		<protocol type="Servlet 3.0" />
 		<configuration>
 			<property name="jbossHome">target/jboss-as-${jboss.as.version}</property>
 		</configuration>
 	</container>
+	-->
 
+	<container qualifier="glassfish-embedded" default="true">
+		<configuration>
+			<property name="resourcesXml">src/test/resources/glassfish-resources.xml</property>
+		</configuration>
+	</container>
 </arquillian>
diff --git a/impl/extension/jpa/src/test/resources/glassfish-resources.xml b/impl/extension/jpa/src/test/resources/glassfish-resources.xml
new file mode 100644
index 0000000..9b60b35
--- /dev/null
+++ b/impl/extension/jpa/src/test/resources/glassfish-resources.xml
@@ -0,0 +1,48 @@
+<!--
+ Demoiselle Framework
+ Copyright (C) 2010 SERPRO
+ ============================================================================
+ This file is part of Demoiselle Framework.
+ 
+ Demoiselle Framework is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public License version 3
+ along with this program; if not,  see <http://www.gnu.org/licenses />
+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA  02110-1301, USA.
+ ============================================================================
+ Este arquivo é parte do Framework Demoiselle.
+ 
+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ do Software Livre (FSF).
+ 
+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ para maiores detalhes.
+ 
+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses />
+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+-->
+<!DOCTYPE resources PUBLIC
+    "-//GlassFish.org//DTD GlassFish Application Server 3.1 Resource Definitions//EN"
+    "http://glassfish.org/dtds/glassfish-resources_1_5.dtd">
+<resources>
+	<jdbc-resource pool-name="ArquillianEmbeddedDerbyPool" jndi-name="jboss/datasources/ExampleDS" />
+
+	<jdbc-connection-pool name="ArquillianEmbeddedDerbyPool" res-type="javax.sql.DataSource" datasource-classname="org.apache.derby.jdbc.EmbeddedDataSource"
+		is-isolation-level-guaranteed="false">
+		<property name="databaseName" value="target/databases/derby" />
+		<property name="createDatabase" value="create" />
+	</jdbc-connection-pool>
+</resources>
\ No newline at end of file
diff --git a/parent/extension/pom.xml b/parent/extension/pom.xml
index 00540d1..c9cbb71 100755
--- a/parent/extension/pom.xml
+++ b/parent/extension/pom.xml
@@ -107,25 +107,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>${jacoco.version}</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>report</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 
@@ -151,18 +132,6 @@
 			<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.jboss.arquillian.extension</groupId>
-			<artifactId>arquillian-jacoco</artifactId>
-			<version>${arquillian.jacoco.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jacoco</groupId>
-			<artifactId>org.jacoco.core</artifactId>
-			<version>${jacoco.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 
 	<repositories>
@@ -219,10 +188,29 @@
 			</dependencies>
 		</profile>
 		<profile>
+			<id>arquillian-glassfish-embedded</id>
+			<dependencies>
+				<dependency>
+					<groupId>org.jboss.arquillian.container</groupId>
+					<artifactId>arquillian-glassfish-embedded-3.1</artifactId>
+					<version>${arquillian.container.glassfish.version}</version>
+					<scope>test</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.glassfish.main.extras</groupId>
+					<artifactId>glassfish-embedded-all</artifactId>
+					<version>${glassfish.embedded.version}</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
 			<id>arquillian-jbossas7-managed</id>
+			<!--
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
+			-->
 			<build>
 				<testResources>
 					<testResource>
@@ -255,6 +243,25 @@
 							</execution>
 						</executions>
 					</plugin>
+					<plugin>
+						<groupId>org.jacoco</groupId>
+						<artifactId>jacoco-maven-plugin</artifactId>
+						<version>${jacoco.version}</version>
+						<executions>
+							<execution>
+								<goals>
+									<goal>prepare-agent</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>report</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>report</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
 				</plugins>
 			</build>
 			<dependencies>
@@ -269,17 +276,31 @@
 					<artifactId>arquillian-protocol-servlet</artifactId>
 					<scope>test</scope>
 				</dependency>
-			</dependencies>
 
-			<properties>
-				<jboss.as.version>7.1.1.Final</jboss.as.version>
-			</properties>
+				<dependency>
+					<groupId>org.jboss.arquillian.extension</groupId>
+					<artifactId>arquillian-jacoco</artifactId>
+					<version>${arquillian.jacoco.version}</version>
+					<scope>test</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.jacoco</groupId>
+					<artifactId>org.jacoco.core</artifactId>
+					<version>${jacoco.version}</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
 		</profile>
 	</profiles>
 
 	<properties>
 		<arquillian.bom.version>1.1.1.Final</arquillian.bom.version>
 		<arquillian.jacoco.version>1.0.0.Alpha5</arquillian.jacoco.version>
+		<arquillian.container.glassfish.version>1.0.0.CR4</arquillian.container.glassfish.version>
+		<jboss.as.version>7.1.1.Final</jboss.as.version>
+
+		<glassfish.embedded.version>3.1.2.2</glassfish.embedded.version>
+
 		<jacoco.version>0.6.0.201210061924</jacoco.version>
 	</properties>
 </project>
--
libgit2 0.21.2