diff --git a/batch-processing/add-h2-ds.cli b/batch-processing/add-h2-ds.cli
new file mode 100644
index 0000000000..ef73534f17
--- /dev/null
+++ b/batch-processing/add-h2-ds.cli
@@ -0,0 +1 @@
+xa-data-source add --name=batch_db --enabled=true --use-java-context=true --use-ccm=true --jndi-name=java:jboss/datasources/batch-processingDS --xa-datasource-properties={"URL"=>"jdbc:h2:mem:batch-processing;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1"} --driver-name=h2 --password=sa --user-name=sa --same-rm-override=false --no-recovery=true
\ No newline at end of file
diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml
index 18a179f0d8..91c810d873 100644
--- a/batch-processing/pom.xml
+++ b/batch-processing/pom.xml
@@ -51,6 +51,9 @@
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>5.0.0.Final</version.plugin.wildfly>
+        <server.test.feature.pack.artifactId>wildfly-ee-galleon-pack</server.test.feature.pack.artifactId>
+        <server.test.feature.pack.groupId>org.wildfly</server.test.feature.pack.groupId>
+        <configure.ds.script>${project.basedir}/add-h2-ds.cli</configure.ds.script>
     </properties>
 
     <dependencyManagement>
@@ -200,12 +203,32 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <discover-provisioning-info>
-                                <version>${version.server}</version>
-                                <addOns>
-                                    <addOn>h2-database:default</addOn>
-                                </addOns>
-                            </discover-provisioning-info>
+                            <feature-packs>
+                                <feature-pack>
+                                    <groupId>${server.test.feature.pack.groupId}</groupId>
+                                    <artifactId>${server.test.feature.pack.artifactId}</artifactId>
+                                    <version>${version.server}</version>
+                                </feature-pack>
+                                <feature-pack>
+                                    <location>org.wildfly:wildfly-datasources-galleon-pack:8.0.1.Final</location>
+                                </feature-pack>
+                            </feature-packs>
+                            <layers>
+                                <layer>core-tools</layer>
+                                <layer>batch-jberet</layer>
+                                <layer>h2-driver</layer>
+                                <layer>jaxrs-server</layer>
+                                <layer>jsf</layer>
+                            </layers>
+                            <packaging-scripts>
+                                <packaging-script>
+                                    <scripts>
+                                        <script>${configure.ds.script}</script>
+                                    </scripts>
+                                    <!-- Expressions resolved during server execution -->
+                                    <resolve-expressions>false</resolve-expressions>
+                                </packaging-script>
+                            </packaging-scripts>
                             <!--
                                 Rename the output war to ROOT.war before adding it to the server, so that the
                                 application is deployed in the root web context.
@@ -231,13 +254,32 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <discover-provisioning-info>
-                                <version>${version.server}</version>
-                                <context>cloud</context>
-                                <addOns>
-                                    <addOn>h2-database:default</addOn>
-                                </addOns>
-                            </discover-provisioning-info>
+                            <feature-packs>
+                                <feature-pack>
+                                    <groupId>${server.test.feature.pack.groupId}</groupId>
+                                    <artifactId>${server.test.feature.pack.artifactId}</artifactId>
+                                    <version>${version.server}</version>
+                                </feature-pack>
+                                <feature-pack>
+                                    <location>org.wildfly:wildfly-datasources-galleon-pack:8.0.1.Final</location>
+                                </feature-pack>
+                            </feature-packs>
+                            <layers>
+                                <layer>core-tools</layer>
+                                <layer>batch-jberet</layer>
+                                <layer>h2-driver</layer>
+                                <layer>jaxrs-server</layer>
+                                <layer>jsf</layer>
+                            </layers>
+                            <packaging-scripts>
+                                <packaging-script>
+                                    <scripts>
+                                        <script>${configure.ds.script}</script>
+                                    </scripts>
+                                    <!-- Expressions resolved during server execution -->
+                                    <resolve-expressions>false</resolve-expressions>
+                                </packaging-script>
+                            </packaging-scripts>
                             <!--
                                 The parent POM's 'openshift' profile renames the output archive to ROOT.war so that the
                                 application is deployed in the root web context. Add ROOT.war to the server.
diff --git a/batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml b/batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml
deleted file mode 100644
index fb23f37023..0000000000
--- a/batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    JBoss, Home of Professional Open Source
-    Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
-    contributors by the @authors tag. See the copyright.txt in the
-    distribution for a full listing of individual contributors.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<!-- This is an unmanaged datasource. It should be used for proofs of concept
-    or testing only. It uses H2, an in memory database that ships with JBoss
-    AS. -->
-<datasources xmlns="http://www.jboss.org/ironjacamar/schema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.jboss.org/ironjacamar/schema http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
-    <!-- The datasource is bound into JNDI at this location. We reference
-        this in META-INF/persistence.xml -->
-    <datasource jndi-name="java:jboss/datasources/batch-processingDS"
-        pool-name="jboss-batch-processing" enabled="true"
-        use-java-context="true">
-        <connection-url>jdbc:h2:mem:batch-processing;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1</connection-url>
-        <driver>h2</driver>
-        <security>
-            <user-name>sa</user-name>
-            <password>sa</password>
-        </security>
-    </datasource>
-</datasources>
-