diff --git a/feature-pack/pom.xml b/feature-pack/pom.xml
index 0e156c279a62..ba777fcaaed4 100644
--- a/feature-pack/pom.xml
+++ b/feature-pack/pom.xml
@@ -1312,11 +1312,6 @@
             <artifactId>jboss-ejb-api_3.2_spec</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.jboss.spec.javax.faces</groupId>
-            <artifactId>jboss-jsf-api_2.2_spec</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.jboss.spec.javax.faces</groupId>
             <artifactId>jboss-jsf-api_2.3_spec</artifactId>
diff --git a/feature-pack/src/license/full-feature-pack-licenses.xml b/feature-pack/src/license/full-feature-pack-licenses.xml
index 3587c461c1dc..f9fae59a3095 100644
--- a/feature-pack/src/license/full-feature-pack-licenses.xml
+++ b/feature-pack/src/license/full-feature-pack-licenses.xml
@@ -3436,22 +3436,6 @@
         </license>
       </licenses>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.spec.javax.faces</groupId>
-      <artifactId>jboss-jsf-api_2.2_spec</artifactId>
-      <licenses>
-        <license>
-          <name>Common Development and Distribution License 1.1</name>
-          <url>https://javaee.github.io/glassfish/LICENSE</url>
-          <distribution>repo</distribution>
-        </license>
-        <license>
-          <name>GNU General Public License, Version 2 with the Classpath Exception</name>
-          <url>http://repository.jboss.org/licenses/gpl-2.0-ce.txt</url>
-          <distribution>repo</distribution>
-        </license>
-      </licenses>
-    </dependency>
     <dependency>
       <groupId>org.jboss.spec.javax.faces</groupId>
       <artifactId>jboss-jsf-api_2.3_spec</artifactId>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/jsf-impl/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/jsf-impl/main/module.xml
index 54576a30cbe8..641167012a14 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/jsf-impl/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/jsf-impl/main/module.xml
@@ -44,19 +44,6 @@
     </dependencies>
 
     <resources>
-        <!--
-            This EE 7 jsf-impl version is being hardcoded temporarily for now.
-            This will be removed once EE 8 support is complete.
-        -->
-        <artifact name="com.sun.faces:jsf-impl:2.2.13.SP5"> <!-- ${version.com.sun.faces-2.2} -->
-            <conditions>
-                <property-not-equal name="ee8.preview.mode" value="true" />
-            </conditions>
-        </artifact>
-        <artifact name="${com.sun.faces:jsf-impl}">
-            <conditions>
-                <property-equal name="ee8.preview.mode" value="true" />
-            </conditions>
-        </artifact>
+        <artifact name="${com.sun.faces:jsf-impl}"/>
     </resources>
 </module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/faces/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/faces/api/main/module.xml
index 3463e0fb2360..2704b1c61fca 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/faces/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/faces/api/main/module.xml
@@ -36,15 +36,6 @@
     </dependencies>
 
     <resources>
-        <artifact name="${org.jboss.spec.javax.faces:jboss-jsf-api_2.2_spec}">
-            <conditions>
-                <property-not-equal name="ee8.preview.mode" value="true" />
-            </conditions>
-        </artifact>
-        <artifact name="${org.jboss.spec.javax.faces:jboss-jsf-api_2.3_spec}">
-            <conditions>
-                <property-equal name="ee8.preview.mode" value="true" />
-            </conditions>
-        </artifact>
+        <artifact name="${org.jboss.spec.javax.faces:jboss-jsf-api_2.3_spec}"/>
     </resources>
 </module>
diff --git a/galleon-pack/pom.xml b/galleon-pack/pom.xml
index 5bc3b7124ff5..3a4772da84c2 100644
--- a/galleon-pack/pom.xml
+++ b/galleon-pack/pom.xml
@@ -1484,11 +1484,6 @@
             <artifactId>jboss-ejb-api_3.2_spec</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.jboss.spec.javax.faces</groupId>
-            <artifactId>jboss-jsf-api_2.2_spec</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.jboss.spec.javax.faces</groupId>
             <artifactId>jboss-jsf-api_2.3_spec</artifactId>
diff --git a/jsf/subsystem/pom.xml b/jsf/subsystem/pom.xml
index b41d4f37200f..b2a5a7b5e849 100644
--- a/jsf/subsystem/pom.xml
+++ b/jsf/subsystem/pom.xml
@@ -107,11 +107,6 @@
             <artifactId>jboss-servlet-api_4.0_spec</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.jboss.spec.javax.faces</groupId>
-            <artifactId>jboss-jsf-api_2.2_spec</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.jboss.spec.javax.faces</groupId>
             <artifactId>jboss-jsf-api_2.3_spec</artifactId>
diff --git a/pom.xml b/pom.xml
index 9ec1fb82128e..16ad7b20469d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,15 +210,7 @@
         <version.com.google.guava>25.0-jre</version.com.google.guava>
         <version.com.h2database>1.4.193</version.com.h2database>
         <version.com.microsoft.azure>6.1.0</version.com.microsoft.azure>
-        <!--
-            Be careful, the EE 7 jsf-impl 2.2.x version is temporarily being hardcoded in
-            the com.sun.jsf-impl module.xml file until EE 8 support is complete. For JSF
-            2.2.x component upgrades, please update the hardcoded version in the module.xml
-            file. For JSF 2.3.x component upgrades, please update the property here.
-        -->
         <version.com.sun.faces>2.3.5.SP1</version.com.sun.faces>
-        <!-- Hardcoded in module.xml for the dual EE7 and EE8 support -->
-        <version.com.sun.faces-2.2>2.2.13.SP5</version.com.sun.faces-2.2>
         <version.com.sun.istack>3.0.5</version.com.sun.istack>
         <version.com.sun.xml.fastinfoset>1.2.13</version.com.sun.xml.fastinfoset>
         <version.commons-beanutils>1.9.3</version.commons-beanutils>
@@ -331,7 +323,6 @@
         <version.org.jboss.spec.javax.ejb.jboss-ejb-api_3.2_spec>1.0.1.Final</version.org.jboss.spec.javax.ejb.jboss-ejb-api_3.2_spec>
         <version.org.jboss.spec.javax.el.jboss-el-api_3.0_spec>1.0.11.Final</version.org.jboss.spec.javax.el.jboss-el-api_3.0_spec>
         <version.org.jboss.spec.javax.enterprise.concurrent.jboss-concurrency-api_1.0_spec>1.0.2.Final</version.org.jboss.spec.javax.enterprise.concurrent.jboss-concurrency-api_1.0_spec>
-        <version.org.jboss.spec.javax.faces.jboss-jsf-api_2.2_spec>2.2.13.SP2</version.org.jboss.spec.javax.faces.jboss-jsf-api_2.2_spec>
         <version.org.jboss.spec.javax.faces.jboss-jsf-api_2.3_spec>2.3.5.SP1</version.org.jboss.spec.javax.faces.jboss-jsf-api_2.3_spec>
         <version.org.jboss.spec.javax.jms.jboss-jms-api_2.0_spec>1.0.2.Final</version.org.jboss.spec.javax.jms.jboss-jms-api_2.0_spec>
         <version.org.jboss.spec.javax.management.j2ee.jboss-j2eemgmt-api_1.1_spec>1.0.2.Final</version.org.jboss.spec.javax.management.j2ee.jboss-j2eemgmt-api_1.1_spec>
@@ -5029,12 +5020,6 @@
                 <version>${version.org.jboss.spec.javax.enterprise.concurrent.jboss-concurrency-api_1.0_spec}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.jboss.spec.javax.faces</groupId>
-                <artifactId>jboss-jsf-api_2.2_spec</artifactId>
-                <version>${version.org.jboss.spec.javax.faces.jboss-jsf-api_2.2_spec}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.jboss.spec.javax.faces</groupId>
                 <artifactId>jboss-jsf-api_2.3_spec</artifactId>
diff --git a/spec-api/pom.xml b/spec-api/pom.xml
index d986763ee4ad..0b83d0faac25 100644
--- a/spec-api/pom.xml
+++ b/spec-api/pom.xml
@@ -70,10 +70,6 @@
       <groupId>org.jboss.spec.javax.enterprise.concurrent</groupId>
       <artifactId>jboss-concurrency-api_1.0_spec</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.spec.javax.faces</groupId>
-      <artifactId>jboss-jsf-api_2.2_spec</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.jboss.spec.javax.faces</groupId>
       <artifactId>jboss-jsf-api_2.3_spec</artifactId>
diff --git a/testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/ConfirmBean.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/ConfirmBean.java
similarity index 96%
rename from testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/ConfirmBean.java
rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/ConfirmBean.java
index 135f31ddb42c..0cb3aa4a8d12 100644
--- a/testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/ConfirmBean.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/ConfirmBean.java
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
-package org.wildfly.test.integration.ee8.temp.jsf23;
+package org.jboss.as.test.integration.jsf.jsf23;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
diff --git a/testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/ConfirmRegistrationBehavior.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/ConfirmRegistrationBehavior.java
similarity index 96%
rename from testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/ConfirmRegistrationBehavior.java
rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/ConfirmRegistrationBehavior.java
index a950e86b00df..e5d4904315dc 100644
--- a/testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/ConfirmRegistrationBehavior.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/ConfirmRegistrationBehavior.java
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
-package org.wildfly.test.integration.ee8.temp.jsf23;
+package org.jboss.as.test.integration.jsf.jsf23;
 
 import javax.faces.component.behavior.ClientBehaviorBase;
 import javax.faces.component.behavior.ClientBehaviorContext;
diff --git a/testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/DummyBean.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/DummyBean.java
similarity index 96%
rename from testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/DummyBean.java
rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/DummyBean.java
index 3d5f7f155ef0..e08ac480520f 100644
--- a/testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/DummyBean.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/DummyBean.java
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
-package org.wildfly.test.integration.ee8.temp.jsf23;
+package org.jboss.as.test.integration.jsf.jsf23;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.faces.annotation.FacesConfig;
diff --git a/testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/JSF23SanityTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/JSF23SanityTestCase.java
similarity index 99%
rename from testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/JSF23SanityTestCase.java
rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/JSF23SanityTestCase.java
index 7a18cf002e42..95200dbbf3f3 100644
--- a/testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/JSF23SanityTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/JSF23SanityTestCase.java
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.wildfly.test.integration.ee8.temp.jsf23;
+package org.jboss.as.test.integration.jsf.jsf23;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/beans.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/beans.xml
similarity index 100%
rename from testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/beans.xml
rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/beans.xml
diff --git a/testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/confirmation.xhtml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/confirmation.xhtml
similarity index 100%
rename from testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/confirmation.xhtml
rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/confirmation.xhtml
diff --git a/testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/faces-config.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/faces-config.xml
similarity index 100%
rename from testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/faces-config.xml
rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/faces-config.xml
diff --git a/testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/index.xhtml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/index.xhtml
similarity index 100%
rename from testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/index.xhtml
rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/index.xhtml
diff --git a/testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/register.taglib.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/register.taglib.xml
similarity index 100%
rename from testsuite/integration/ee8-temp/src/test/java/org/wildfly/test/integration/ee8/temp/jsf23/register.taglib.xml
rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/jsf23/register.taglib.xml