diff --git a/pom.xml b/pom.xml
index 624fb4c..135f432 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --> 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -31,21 +32,23 @@
     <name>Seam Compatibility Module</name>
     <!-- url required for JAR Manifest -->
     <url>http://www.seamframework.org/Seam3/Compatibility</url>
-    
+
     <properties>
+        <arquillian.version>1.0.0.CR1</arquillian.version>
         <seam.version>3.0.0.CR9</seam.version>
-    </properties>    
-    
+        <jbossas7.version>7.0.0.CR1</jbossas7.version>
+    </properties>
+
     <dependencyManagement>
-      <dependencies>
-          <dependency>
-             <groupId>org.jboss.seam</groupId>
-             <artifactId>seam-bom</artifactId>
-             <version>${seam.version}</version>
-             <scope>import</scope>
-             <type>pom</type>
-         </dependency>    
-      </dependencies>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.seam</groupId>
+                <artifactId>seam-bom</artifactId>
+                <version>${seam.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
     </dependencyManagement>
 
     <dependencies>
@@ -63,9 +66,9 @@
         </dependency>
 
         <dependency>
-             <groupId>org.jboss.spec.javax.servlet</groupId>
-             <artifactId>jboss-servlet-api_3.0_spec</artifactId>
-             <scope>provided</scope>
+            <groupId>org.jboss.spec.javax.servlet</groupId>
+            <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -74,9 +77,9 @@
         </dependency>
 
         <dependency>
-             <groupId>org.jboss.resteasy</groupId>
-             <artifactId>jaxrs-api</artifactId>
-             <scope>provided</scope>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>jaxrs-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -88,9 +91,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.jboss.arquillian</groupId>
-            <artifactId>arquillian-junit</artifactId>
-            <version>1.0.0.Alpha5</version>
+            <groupId>org.jboss.arquillian.junit</groupId>
+            <artifactId>arquillian-junit-container</artifactId>
+            <version>${arquillian.version}</version>
         </dependency>
 
         <dependency>
@@ -157,49 +160,47 @@
             </pluginRepositories>
         </profile>
         <profile>
-            <id>itest-jbossas-managed</id>
+            <id>jbossas-managed-6</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
                 <property>
-                    <name>itest-container</name>
-                    <value>jbossas-managed</value>
+                    <name>arquillian</name>
+                    <value>jbossas-managed-6</value>
                 </property>
             </activation>
             <dependencies>
+                <dependency>
+                    <groupId>org.jboss.jbossas</groupId>
+                    <artifactId>jboss-as-client</artifactId>
+                    <type>pom</type>
+                    <scope>test</scope>
+                </dependency>
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-jbossas-managed-6</artifactId>
-                    <version>1.0.0.Alpha5</version>
+                    <version>${arquillian.version}</version>
+                    <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.jboss.jbossas</groupId>
                     <artifactId>jboss-server-manager</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.jboss.jbossas</groupId>
-                    <artifactId>jboss-as-client</artifactId>
-                    <type>pom</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.jboss.weld</groupId>
-                    <artifactId>weld-core</artifactId>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
         </profile>
         <profile>
-            <id>itest-jbossas-remote</id>
+            <id>jbossas-remote-6</id>
             <activation>
                 <property>
-                    <name>itest-container</name>
-                    <value>jbossas-remote</value>
+                    <name>arquillian</name>
+                    <value>jbossas-remote-6</value>
                 </property>
             </activation>
             <dependencies>
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-jbossas-remote-6</artifactId>
-                    <version>1.0.0.Alpha5</version>
+                    <version>${jbossas7.version}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.jboss.jbossas</groupId>
@@ -225,11 +226,49 @@
             </build>
         </profile>
         <profile>
-            <id>itest-glassfish-remote</id>
+            <id>jbossas-remote-7</id>
+            <activation>
+                <property>
+                    <name>arquillian</name>
+                    <value>jbossas-remote-7</value>
+                </property>
+            </activation>
+            <properties>
+                <arquillian.launch>jbossas7</arquillian.launch>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.jboss.as</groupId>
+                    <artifactId>jboss-as-arquillian-container-remote</artifactId>
+                    <version>${jbossas7.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>jbossas-managed-7</id>
+            <activation>
+                <property>
+                    <name>arquillian</name>
+                    <value>jbossas-managed-7</value>
+                </property>
+            </activation>
+            <properties>
+                <arquillian.launch>jbossas7</arquillian.launch>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.jboss.as</groupId>
+                    <artifactId>jboss-as-arquillian-container-managed</artifactId>
+                    <version>${jbossas7.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>glassfish-remote-3.1</id>
             <activation>
                 <property>
-                    <name>itest-container</name>
-                    <value>glassfish-remote</value>
+                    <name>arquillian</name>
+                    <value>glassfish-remote-3.1</value>
                 </property>
             </activation>
             <dependencies>
@@ -237,7 +276,7 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-glassfish-remote-3.1</artifactId>
-                    <version>1.0.0.Alpha5</version>
+                    <version>${jbossas7.version}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
diff --git a/src/test/java/org/jboss/seam/compat/cdi/alternative/AlternativeTest.java b/src/test/java/org/jboss/seam/compat/cdi/alternative/AlternativeTest.java
index d95823b..788f83d 100644
--- a/src/test/java/org/jboss/seam/compat/cdi/alternative/AlternativeTest.java
+++ b/src/test/java/org/jboss/seam/compat/cdi/alternative/AlternativeTest.java
@@ -19,7 +19,7 @@
 import javax.enterprise.inject.spi.Extension;
 import javax.inject.Inject;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
diff --git a/src/test/java/org/jboss/seam/compat/cdi/interceptor/EnableInterceptorTest.java b/src/test/java/org/jboss/seam/compat/cdi/interceptor/EnableInterceptorTest.java
index 2af932d..9147315 100644
--- a/src/test/java/org/jboss/seam/compat/cdi/interceptor/EnableInterceptorTest.java
+++ b/src/test/java/org/jboss/seam/compat/cdi/interceptor/EnableInterceptorTest.java
@@ -1,6 +1,6 @@
 package org.jboss.seam.compat.cdi.interceptor;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
@@ -36,6 +36,7 @@ public static WebArchive createDeployment() {
 
     @Test
     public void shouldInterceptBeanMethod(Bean bean, Bit bit) {
+        bit.reset();
         bean.operation();
         Assert.assertTrue("Method was not intercepted", bit.isFlipped());
     }
diff --git a/src/test/java/org/jboss/seam/compat/cdi/packaging/ear/MultiWebAppTest.java b/src/test/java/org/jboss/seam/compat/cdi/packaging/ear/MultiWebAppTest.java
index a4e0954..b31ccf7 100644
--- a/src/test/java/org/jboss/seam/compat/cdi/packaging/ear/MultiWebAppTest.java
+++ b/src/test/java/org/jboss/seam/compat/cdi/packaging/ear/MultiWebAppTest.java
@@ -1,6 +1,6 @@
 package org.jboss.seam.compat.cdi.packaging.ear;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
diff --git a/src/test/java/org/jboss/seam/compat/cdi/packaging/ear/SingleWebAppTest.java b/src/test/java/org/jboss/seam/compat/cdi/packaging/ear/SingleWebAppTest.java
index 87379bc..71b56ec 100644
--- a/src/test/java/org/jboss/seam/compat/cdi/packaging/ear/SingleWebAppTest.java
+++ b/src/test/java/org/jboss/seam/compat/cdi/packaging/ear/SingleWebAppTest.java
@@ -2,7 +2,7 @@
 
 import javax.enterprise.inject.spi.Extension;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
diff --git a/src/test/java/org/jboss/seam/compat/cdi/registration/BeanRegistrationByExtensionInNonBeanArchiveTest.java b/src/test/java/org/jboss/seam/compat/cdi/registration/BeanRegistrationByExtensionInNonBeanArchiveTest.java
index 738c3de..c237eca 100644
--- a/src/test/java/org/jboss/seam/compat/cdi/registration/BeanRegistrationByExtensionInNonBeanArchiveTest.java
+++ b/src/test/java/org/jboss/seam/compat/cdi/registration/BeanRegistrationByExtensionInNonBeanArchiveTest.java
@@ -18,7 +18,7 @@
 
 import javax.enterprise.inject.spi.Extension;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
diff --git a/src/test/java/org/jboss/seam/compat/cdi/registration/VisibilityOfBeanRegisteredByExtensionFromNonBeanLibraryTest.java b/src/test/java/org/jboss/seam/compat/cdi/registration/VisibilityOfBeanRegisteredByExtensionFromNonBeanLibraryTest.java
index 5d93bca..5de9c9b 100644
--- a/src/test/java/org/jboss/seam/compat/cdi/registration/VisibilityOfBeanRegisteredByExtensionFromNonBeanLibraryTest.java
+++ b/src/test/java/org/jboss/seam/compat/cdi/registration/VisibilityOfBeanRegisteredByExtensionFromNonBeanLibraryTest.java
@@ -18,7 +18,7 @@
 
 import javax.enterprise.inject.spi.Extension;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
diff --git a/src/test/java/org/jboss/seam/compat/cdi/validation/ObserverMethodParameterInjectionValidationTest.java b/src/test/java/org/jboss/seam/compat/cdi/validation/ObserverMethodParameterInjectionValidationTest.java
index 668ade2..370f00e 100644
--- a/src/test/java/org/jboss/seam/compat/cdi/validation/ObserverMethodParameterInjectionValidationTest.java
+++ b/src/test/java/org/jboss/seam/compat/cdi/validation/ObserverMethodParameterInjectionValidationTest.java
@@ -18,7 +18,7 @@
 
 import javax.enterprise.inject.spi.BeanManager;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
diff --git a/src/test/java/org/jboss/seam/compat/cdi/visibility/JarToJarAlphaVisibilityTest.java b/src/test/java/org/jboss/seam/compat/cdi/visibility/JarToJarAlphaVisibilityTest.java
index 767ed66..7f1fd60 100644
--- a/src/test/java/org/jboss/seam/compat/cdi/visibility/JarToJarAlphaVisibilityTest.java
+++ b/src/test/java/org/jboss/seam/compat/cdi/visibility/JarToJarAlphaVisibilityTest.java
@@ -16,7 +16,7 @@
  */
 package org.jboss.seam.compat.cdi.visibility;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
diff --git a/src/test/java/org/jboss/seam/compat/cdi/visibility/JarToJarReverseAlphaVisibilityTest.java b/src/test/java/org/jboss/seam/compat/cdi/visibility/JarToJarReverseAlphaVisibilityTest.java
index 383c429..dbfb22a 100644
--- a/src/test/java/org/jboss/seam/compat/cdi/visibility/JarToJarReverseAlphaVisibilityTest.java
+++ b/src/test/java/org/jboss/seam/compat/cdi/visibility/JarToJarReverseAlphaVisibilityTest.java
@@ -16,7 +16,7 @@
  */
 package org.jboss.seam.compat.cdi.visibility;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
diff --git a/src/test/java/org/jboss/seam/compat/cdi/visibility/VisibilityOfAnnotatedTypesFromExtensionInAlphaBeanArchiveTest.java b/src/test/java/org/jboss/seam/compat/cdi/visibility/VisibilityOfAnnotatedTypesFromExtensionInAlphaBeanArchiveTest.java
index 1d6ad41..66118f5 100644
--- a/src/test/java/org/jboss/seam/compat/cdi/visibility/VisibilityOfAnnotatedTypesFromExtensionInAlphaBeanArchiveTest.java
+++ b/src/test/java/org/jboss/seam/compat/cdi/visibility/VisibilityOfAnnotatedTypesFromExtensionInAlphaBeanArchiveTest.java
@@ -18,7 +18,7 @@
 
 import javax.enterprise.inject.spi.Extension;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
diff --git a/src/test/java/org/jboss/seam/compat/cdi/visibility/VisibilityOfAnnotatedTypesFromExtensionInBravoBeanArchiveTest.java b/src/test/java/org/jboss/seam/compat/cdi/visibility/VisibilityOfAnnotatedTypesFromExtensionInBravoBeanArchiveTest.java
index f094e8c..1b28ac4 100644
--- a/src/test/java/org/jboss/seam/compat/cdi/visibility/VisibilityOfAnnotatedTypesFromExtensionInBravoBeanArchiveTest.java
+++ b/src/test/java/org/jboss/seam/compat/cdi/visibility/VisibilityOfAnnotatedTypesFromExtensionInBravoBeanArchiveTest.java
@@ -18,7 +18,7 @@
 
 import javax.enterprise.inject.spi.Extension;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
diff --git a/src/test/java/org/jboss/seam/compat/cdi/visibility/VisibilityOfBeanInWebModuleFromBeanManagerInBeanLibraryTest.java b/src/test/java/org/jboss/seam/compat/cdi/visibility/VisibilityOfBeanInWebModuleFromBeanManagerInBeanLibraryTest.java
index 2c03892..9db7eff 100644
--- a/src/test/java/org/jboss/seam/compat/cdi/visibility/VisibilityOfBeanInWebModuleFromBeanManagerInBeanLibraryTest.java
+++ b/src/test/java/org/jboss/seam/compat/cdi/visibility/VisibilityOfBeanInWebModuleFromBeanManagerInBeanLibraryTest.java
@@ -16,7 +16,7 @@
  */
 package org.jboss.seam.compat.cdi.visibility;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
diff --git a/src/test/java/org/jboss/seam/compat/ejb/deployment/DeploymentOrderTest.java b/src/test/java/org/jboss/seam/compat/ejb/deployment/DeploymentOrderTest.java
index 6652b36..92ca1a5 100644
--- a/src/test/java/org/jboss/seam/compat/ejb/deployment/DeploymentOrderTest.java
+++ b/src/test/java/org/jboss/seam/compat/ejb/deployment/DeploymentOrderTest.java
@@ -1,6 +1,6 @@
 package org.jboss.seam.compat.ejb.deployment;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
diff --git a/src/test/java/org/jboss/seam/compat/jaxrs/interceptor/InterceptedResourceTest.java b/src/test/java/org/jboss/seam/compat/jaxrs/interceptor/InterceptedResourceTest.java
index 54876f7..18243aa 100644
--- a/src/test/java/org/jboss/seam/compat/jaxrs/interceptor/InterceptedResourceTest.java
+++ b/src/test/java/org/jboss/seam/compat/jaxrs/interceptor/InterceptedResourceTest.java
@@ -1,9 +1,6 @@
 package org.jboss.seam.compat.jaxrs.interceptor;
 
-import java.net.URL;
-
-import org.jboss.arquillian.api.ArquillianResource;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.compat.jaxrs.AbstractRestClientTest;
 import org.jboss.seam.compat.jaxrs.MyApplication;
@@ -21,15 +18,17 @@
 
 @RunWith(Arquillian.class)
 public class InterceptedResourceTest extends AbstractRestClientTest {
-    @ArquillianResource
-    URL deploymentUrl;
+    // ARQ-504
+    // @ArquillianResource
+    // URL deploymentUrl;
+
+    private String deploymentUrl = "http://localhost:8080/test/";
 
     @Deployment(testable = false)
     public static WebArchive getDeployment() {
         BeansDescriptor beansXml = Descriptors.create(BeansDescriptor.class).interceptor(ValidationInterceptor.class);
         WebAppDescriptor webXml = Descriptors.create(WebAppDescriptor.class);
-        return ShrinkWrap.create(WebArchive.class, "test.war")
-                .addClasses(MyApplication.class, Resource.class)
+        return ShrinkWrap.create(WebArchive.class, "test.war").addClasses(MyApplication.class, Resource.class)
                 .addAsWebInfResource(new StringAsset(beansXml.exportAsString()), beansXml.getDescriptorName())
                 .setWebXML(new StringAsset(webXml.exportAsString())).addAsLibrary(getJar());
     }
diff --git a/src/test/java/org/jboss/seam/compat/jaxrs/provider/ApplicationInjectedIntoProviderTest.java b/src/test/java/org/jboss/seam/compat/jaxrs/provider/ApplicationInjectedIntoProviderTest.java
index e471e4c..b132466 100644
--- a/src/test/java/org/jboss/seam/compat/jaxrs/provider/ApplicationInjectedIntoProviderTest.java
+++ b/src/test/java/org/jboss/seam/compat/jaxrs/provider/ApplicationInjectedIntoProviderTest.java
@@ -1,9 +1,6 @@
 package org.jboss.seam.compat.jaxrs.provider;
 
-import java.net.URL;
-
-import org.jboss.arquillian.api.ArquillianResource;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.compat.jaxrs.AbstractRestClientTest;
 import org.jboss.seam.compat.jaxrs.MyApplication;
@@ -18,14 +15,17 @@
 
 /**
  * Verifies that an Application subclass can be injected into a JAX-RS provider.
- *
+ * 
  * @author <a href="http://community.jboss.org/people/jharting">Jozef Hartinger</a>
  * @see https://issues.jboss.org/browse/RESTEASY-506
  */
 @RunWith(Arquillian.class)
 public class ApplicationInjectedIntoProviderTest extends AbstractRestClientTest {
-    @ArquillianResource
-    URL deploymentUrl;
+    // ARQ-504
+    // @ArquillianResource
+    // URL deploymentUrl;
+
+    private String deploymentUrl = "http://localhost:8080/test/";
 
     @Deployment(testable = false)
     public static WebArchive getDeployment() {
diff --git a/src/test/java/org/jboss/seam/compat/jaxrs/provider/ProviderInjectionTest.java b/src/test/java/org/jboss/seam/compat/jaxrs/provider/ProviderInjectionTest.java
index daff58b..1581c27 100644
--- a/src/test/java/org/jboss/seam/compat/jaxrs/provider/ProviderInjectionTest.java
+++ b/src/test/java/org/jboss/seam/compat/jaxrs/provider/ProviderInjectionTest.java
@@ -1,9 +1,6 @@
 package org.jboss.seam.compat.jaxrs.provider;
 
-import java.net.URL;
-
-import org.jboss.arquillian.api.ArquillianResource;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.compat.jaxrs.AbstractRestClientTest;
 import org.jboss.seam.compat.jaxrs.MyApplication;
@@ -20,15 +17,18 @@
 
 /**
  * Verifies that a JAX-RS provider gets JAX-RS injections when bundled inside a .jar placed in WEB-INF/lib.
- *
+ * 
  * @author <a href="http://community.jboss.org/people/jharting">Jozef Hartinger</a>
  * @see http://java.net/jira/browse/GLASSFISH-15794
  * @see https://issues.jboss.org/browse/RESTEASY-506
  */
 @RunWith(Arquillian.class)
 public class ProviderInjectionTest extends AbstractRestClientTest {
-    @ArquillianResource
-    URL deploymentUrl;
+//    ARQ-504
+//    @ArquillianResource
+//    URL deploymentUrl;
+
+    private String deploymentUrl = "http://localhost:8080/test/";
 
     @Deployment(testable = false)
     public static WebArchive getDeployment() {
diff --git a/src/test/java/org/jboss/seam/compat/scanning/ExtendedClassTest.java b/src/test/java/org/jboss/seam/compat/scanning/ExtendedClassTest.java
index a89bec9..9305dd3 100644
--- a/src/test/java/org/jboss/seam/compat/scanning/ExtendedClassTest.java
+++ b/src/test/java/org/jboss/seam/compat/scanning/ExtendedClassTest.java
@@ -1,6 +1,6 @@
 package org.jboss.seam.compat.scanning;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
diff --git a/src/test/java/org/jboss/seam/compat/scanning/ImportedClassTest.java b/src/test/java/org/jboss/seam/compat/scanning/ImportedClassTest.java
index 5194f84..2bc93f6 100644
--- a/src/test/java/org/jboss/seam/compat/scanning/ImportedClassTest.java
+++ b/src/test/java/org/jboss/seam/compat/scanning/ImportedClassTest.java
@@ -1,6 +1,6 @@
 package org.jboss.seam.compat.scanning;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
diff --git a/src/test/resources/arquillian.xml b/src/test/resources/arquillian.xml
index 5218e60..49ecd37 100644
--- a/src/test/resources/arquillian.xml
+++ b/src/test/resources/arquillian.xml
@@ -15,19 +15,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --> 
-<arquillian xmlns="http://jboss.com/arquillian"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xmlns:jboss="urn:arq:org.jboss.arquillian.container.jbossas.managed_6">
+<arquillian xmlns="http://jboss.com/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-   <engine>
-      <maxDeploymentsBeforeRestart>20</maxDeploymentsBeforeRestart>
-   </engine>
-   
-   <jboss:container>
-<!--     <jboss:jbossHome>/home/aslak/dev/servers/jboss-6.0.0.M3/</jboss:jbossHome> --> <!-- default %JBOSS_HOME% -->
-<!--     <jboss:javaHome>/usr/lib/jvm/java-6-openjdk</jboss:javaHome> -->  <!-- default %JAVA_HOME% -->
-      <!-- Increase the permgen space by default, heap space is default -->
-      <jboss:javaVmArguments>-Xmx512m -XX:MaxPermSize=256m</jboss:javaVmArguments>
-   </jboss:container>   
+    <engine>
+        <maxDeploymentsBeforeRestart>20</maxDeploymentsBeforeRestart>
+    </engine>
+
+    <container qualifier="jbossas7" default="true">
+        <protocol type="jmx-as7">
+            <property name="executionType">REMOTE</property>
+        </protocol>
+    </container>
 
 </arquillian>