diff --git a/.travis.yml b/.travis.yml
index fc8680671b..89cb443597 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,46 +1,55 @@
+# DSpace's Travis CI Configuration
+# Builds: https://travis-ci.com/github/DSpace/DSpace
+# Travis configuration guide/validation: https://config.travis-ci.com/explore
 language: java
-sudo: false
+# TODO: Upgrade to Bionic
 dist: trusty
-
-env:
-  # Give Maven 1GB of memory to work with
-  - MAVEN_OPTS=-Xmx1024M
+os: linux
 
 jdk:
   # DS-3384 Oracle JDK has DocLint enabled by default.
   # Let's use this to catch any newly introduced DocLint issues.
   - oraclejdk11
 
-## Should we run into any problems with oraclejdk8 on Travis, we may try the following workaround.
-## https://docs.travis-ci.com/user/languages/java#Testing-Against-Multiple-JDKs
-## https://github.com/travis-ci/travis-ci/issues/3259#issuecomment-130860338
-#addons:
-#  apt:
-#    packages:
-#      - oracle-java8-installer
+# Define global environment variables (shared across all jobs)
+env:
+  global:
+    # Suppress all Maven "downloading" messages in Travis logs (see https://stackoverflow.com/a/35653426)
+    # This also slightly speeds builds in Travis, as there is less logging
+    - HIDE_MAVEN_DOWNLOADS="-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+    # Give Maven 1GB of memory to work with
+    - MAVEN_OPTS="-Xmx1024M $HIDE_MAVEN_DOWNLOADS"
+    # Maven options which will skip ALL code validation checks. Includes skipping:
+    #  - enforcer.skip     => Skip maven-enforcer-plugin rules
+    #  - checkstyle.skip   => Skip all checkstyle checks by maven-checkstyle-plugin
+    #  - license.skip      => Skip all license header checks by license-maven-plugin
+    #  - xml.skip          => Skip all XML/XSLT validation by xml-maven-plugin
+    # (Useful for builds which don't need to repeat code checks)
+    - SKIP_CODE_CHECKS="-Denforcer.skip=true -Dcheckstyle.skip=true -Dlicense.skip=true -Dxml.skip=true"
 
-before_install:
-  # Remove outdated settings.xml from Travis builds. Workaround for https://github.com/travis-ci/travis-ci/issues/4629
-  - rm ~/.m2/settings.xml
+# Create two jobs to run Unit & Integration tests in parallel.
+# These jobs only differ in the TEST_FLAGS defined below,
+# and otherwise share all the other configs in this file
+jobs:
+  include:
+    - name: "Run Unit Tests & Check Code"
+      # NOTE: unit tests include deprecated REST API v6 (as it has unit tests)
+      env: TEST_FLAGS="-DskipUnitTests=false -Pdspace-rest"
+    - name: "Run Integration Tests"
+      # NOTE: skips code checks, as they are already done by Unit Test job
+      env: TEST_FLAGS="-DskipIntegrationTests=false $SKIP_CODE_CHECKS"
 
-# Skip install stage, as we'll do it below
-install: "echo 'Skipping install stage, dependencies will be downloaded during build and test stages.'"
+# Skip 'install' process to save time. We build/install/test all at once in "script" below.
+install: skip
 
-# Build DSpace and run both Unit and Integration Tests
-script:
-  # Summary of flags used (below):
-  #     license:check           => Validate all source code license headers
-  #     -DskipTests=false       => Enable DSpace Unit Tests
-  #     -DskipITs=false         => Enable DSpace Integration Tests
-  #     -Pdspace-rest           => Enable optional dspace-rest module as part of build
-  #     -P !assembly            => Skip assembly of "dspace-installer" directory (as it can be memory intensive)
-  #     -B                      => Maven batch/non-interactive mode (recommended for CI)
-  #     -V                      => Display Maven version info before build
-  #     -Dsurefire.rerunFailingTestsCount=2 => try again for flakey tests, and keep track of/report on number of retries
-  - "mvn clean install license:check -DskipTests=false -DskipITs=false -Pdspace-rest -P !assembly -B -V -Dsurefire.rerunFailingTestsCount=2"
+# Build DSpace and run configured tests (see 'jobs' above)
+# Notes on flags used:
+#  -B                => Maven batch/non-interactive mode (recommended for CI)
+#  -V                => Display Maven version info before build
+#  -P-assembly       => Disable build of dspace-installer in [src]/dspace/, as it can be memory intensive
+#  -Pcoverage-report => Enable aggregate code coverage report (across all modules) via JaCoCo
+script: mvn install -B -V -P-assembly -Pcoverage-report $TEST_FLAGS
 
-# After a successful build and test (see 'script'), send code coverage reports to coveralls.io
-# These code coverage reports are generated by jacoco-maven-plugin (during test process above).
-after_success:
-  # Run "verify", enabling the "coveralls" profile. This sends our reports to coveralls.io (see coveralls-maven-plugin)
-  - "cd dspace && mvn verify -P coveralls"
+# After a successful build and test (see 'script'), send aggregate code coverage reports
+# (generated by -Pcoverage-report above) to CodeCov.io
+after_success: bash <(curl -s https://codecov.io/bash)
diff --git a/README.md b/README.md
index 32849d9e30..4842058c8b 100644
--- a/README.md
+++ b/README.md
@@ -90,33 +90,33 @@ run automatically by [Travis CI](https://travis-ci.com/DSpace/DSpace/) for all P
 
 * How to run both Unit Tests (via `maven-surefire-plugin`) and Integration Tests (via `maven-failsafe-plugin`):
   ```
-  mvn clean test -DskipTests=false -DskipITs=false
+  mvn install -DskipUnitTests=false -DskipIntegrationTests=false
   ```
-* How to run just Unit Tests:
+* How to run _only_ Unit Tests:
   ```
-  mvn test -DskipTests=false
+  mvn test -DskipUnitTests=false
   ```
 * How to run a *single* Unit Test
   ```
   # Run all tests in a specific test class
   # NOTE: failIfNoTests=false is required to skip tests in other modules
-  mvn test -DskipTests=false -Dtest=[full.package.testClassName] -DfailIfNoTests=false
+  mvn test -DskipUnitTests=false -Dtest=[full.package.testClassName] -DfailIfNoTests=false
 
   # Run one test method in a specific test class
-  mvn test -DskipTests=false -Dtest=[full.package.testClassName]#[testMethodName] -DfailIfNoTests=false
+  mvn test -DskipUnitTests=false -Dtest=[full.package.testClassName]#[testMethodName] -DfailIfNoTests=false
   ```
-* How to run Integration Tests (requires enabling Unit tests too)
+* How to run _only_ Integration Tests
   ```
-  mvn verify -DskipTests=false -DskipITs=false
+  mvn install -DskipIntegrationTests=false
   ```
-* How to run a *single* Integration Test (requires enabling Unit tests too)
+* How to run a *single* Integration Test
   ```
   # Run all integration tests in a specific test class
   # NOTE: failIfNoTests=false is required to skip tests in other modules
-  mvn test -DskipTests=false -DskipITs=false -Dtest=[full.package.testClassName] -DfailIfNoTests=false
+  mvn install -DskipIntegrationTests=false -Dtest=[full.package.testClassName] -DfailIfNoTests=false
 
   # Run one test method in a specific test class
-  mvn test -DskipTests=false -DskipITs=false -Dtest=[full.package.testClassName]#[testMethodName] -DfailIfNoTests=false
+  mvn install -DskipIntegrationTests=false -Dtest=[full.package.testClassName]#[testMethodName] -DfailIfNoTests=false
   ```
 * How to run only tests of a specific DSpace module
   ```
diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index 41ad956d82..7f5307a502 100644
--- a/dspace-api/pom.xml
+++ b/dspace-api/pom.xml
@@ -127,6 +127,36 @@
                 </executions>
             </plugin>
 
+            <!-- This plugin allows us to run a Groovy script in our Maven POM
+                 (see: https://groovy.github.io/gmaven/groovy-maven-plugin/execute.html )
+                 We are generating a OS-agnostic version (agnostic.build.dir) of
+                 the ${project.build.directory} property (full path of target dir).
+                 This is needed by the Surefire & Failsafe plugins (see below)
+                 to initialize the Unit Test environment's dspace.cfg file.
+                 Otherwise, the Unit Test Framework will not work on Windows OS.
+                 This Groovy code was mostly borrowed from:
+                 http://stackoverflow.com/questions/3872355/how-to-convert-file-separator-in-maven
+            -->
+            <plugin>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>setproperty</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+                                project.properties['agnostic.build.dir'] = project.build.directory.replace(File.separator, '/');
+                                log.info("Initializing Maven property 'agnostic.build.dir' to: {}", project.properties['agnostic.build.dir']);
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>
 
@@ -136,10 +166,6 @@
             <id>findbugs</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
-                <!-- property>
-                    <name>skipTests</name>
-                    <value>false</value>
-                </property -->
             </activation>
             <build>
                 <plugins>
@@ -151,20 +177,19 @@
             </build>
         </profile>
 
-        <!-- If Unit Testing is enabled, then setup the Unit Test Environment.
-             See also the 'skiptests' profile in Parent POM. -->
+        <!-- Setup the Unit Test Environment (when -DskipUnitTests=false) -->
         <profile>
-            <id>test-environment</id>
+            <id>unit-test-environment</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
                 <property>
-                    <name>skipTests</name>
+                    <name>skipUnitTests</name>
                     <value>false</value>
                 </property>
             </activation>
             <build>
                 <plugins>
-                    <!-- Unit/Integration Testing setup: This plugin unzips the
+                    <!-- Unit Testing setup: This plugin unzips the
                          'testEnvironment.zip' file (created by dspace-parent POM), into
                          the 'target/testing/' folder, to essentially create a test
                          install of DSpace, against which Tests can be run. -->
@@ -184,53 +209,16 @@
                         </configuration>
                         <executions>
                             <execution>
-                                <id>setupTestEnvironment</id>
+                                <id>setupUnitTestEnvironment</id>
                                 <phase>generate-test-resources</phase>
                                 <goals>
                                     <goal>unpack</goal>
                                 </goals>
                             </execution>
-                            <execution>
-                                <id>setupIntegrationTestEnvironment</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                            </execution>
                         </executions>
                     </plugin>
 
-                    <!-- This plugin allows us to run a Groovy script in our Maven POM
-                         (see: http://gmaven.codehaus.org/Executing+Groovy+Code )
-                         We are generating a OS-agnostic version (agnostic.build.dir) of
-                         the ${project.build.directory} property (full path of target dir).
-                         This is needed by the Surefire & Failsafe plugins (see below)
-                         to initialize the Unit Test environment's dspace.cfg file.
-                         Otherwise, the Unit Test Framework will not work on Windows OS.
-                         This Groovy code was mostly borrowed from:
-                         http://stackoverflow.com/questions/3872355/how-to-convert-file-separator-in-maven
-                    -->
-                    <plugin>
-                        <groupId>org.codehaus.gmaven</groupId>
-                        <artifactId>groovy-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>setproperty</id>
-                                <phase>initialize</phase>
-                                <goals>
-                                    <goal>execute</goal>
-                                </goals>
-                                <configuration>
-                                    <source>
-                                        project.properties['agnostic.build.dir'] = project.build.directory.replace(File.separator, '/');
-                                        log.info("Initializing Maven property 'agnostic.build.dir' to: {}", project.properties['agnostic.build.dir']);
-                                    </source>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <!-- Run Unit Testing! This plugin just kicks off the tests (when enabled). -->
+                    <!-- Run Unit Testing! This plugin just kicks off the tests. -->
                     <plugin>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
@@ -245,8 +233,52 @@
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
+                </plugins>
+            </build>
+        </profile>
 
-                    <!-- Run Integration Testing! This plugin just kicks off the tests (when enabled). -->
+        <!-- Setup the Integration Test Environment (when -DskipIntegrationTests=false) -->
+        <profile>
+            <id>integration-test-environment</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>skipIntegrationTests</name>
+                    <value>false</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- Integration Testing setup: This plugin unzips the
+                         'testEnvironment.zip' file (created by dspace-parent POM), into
+                         the 'target/testing/' folder, to essentially create a test
+                         install of DSpace, against which Tests can be run. -->
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/testing</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.dspace</groupId>
+                                    <artifactId>dspace-parent</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                    <classifier>testEnvironment</classifier>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>setupIntegrationTestEnvironment</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!-- Run Integration Testing! This plugin just kicks off the tests. -->
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <configuration>
@@ -262,7 +294,6 @@
                     </plugin>
                 </plugins>
             </build>
-
         </profile>
     </profiles>
 
@@ -332,7 +363,7 @@
             <artifactId>jersey-hk2</artifactId>
             <version>${jersey.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index 96ed8bd2d3..edd4b55210 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -29,121 +29,6 @@
         <start-class>org.dspace.app.rest.Application</start-class>
     </properties>
 
-    <profiles>
-        <!-- If Unit Testing is enabled, then setup the Unit Test Environment.
-             See also the 'skiptests' profile in Parent POM. -->
-        <profile>
-            <id>test-environment</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <property>
-                    <name>skipTests</name>
-                    <value>false</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <!-- Unit/Integration Testing setup: This plugin unzips the
-                         'testEnvironment.zip' file (created by dspace-parent POM), into
-                         the 'target/testing/' folder, to essentially create a test
-                         install of DSpace, against which Tests can be run. -->
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/testing</outputDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.dspace</groupId>
-                                    <artifactId>dspace-parent</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>zip</type>
-                                    <classifier>testEnvironment</classifier>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>setupTestEnvironment</id>
-                                <phase>generate-test-resources</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>setupIntegrationTestEnvironment</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <!-- This plugin allows us to run a Groovy script in our Maven POM
-                         (see: http://gmaven.codehaus.org/Executing+Groovy+Code )
-                         We are generating a OS-agnostic version (agnostic.build.dir) of
-                         the ${project.build.directory} property (full path of target dir).
-                         This is needed by the FileWeaver & Surefire plugins (see below)
-                         to initialize the Unit Test environment's dspace.cfg file.
-                         Otherwise, the Unit Test Framework will not work on Windows OS.
-                         This Groovy code was mostly borrowed from:
-                         http://stackoverflow.com/questions/3872355/how-to-convert-file-separator-in-maven
-                    -->
-                    <plugin>
-                        <groupId>org.codehaus.gmaven</groupId>
-                        <artifactId>groovy-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>setproperty</id>
-                                <phase>generate-test-resources
-                                </phase> <!-- XXX I think this should be 'initialize' - MHW -->
-                                <goals>
-                                    <goal>execute</goal>
-                                </goals>
-                                <configuration>
-                                    <source>
-                                        project.properties['agnostic.build.dir'] = project.build.directory.replace(File.separator, '/');
-                                        println("Initializing Maven property 'agnostic.build.dir' to: " + project.properties['agnostic.build.dir']);
-                                    </source>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <!-- Run Unit Testing! This plugin just kicks off the tests (when enabled). -->
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <!-- Specify the dspace.dir to use for test environment -->
-                                <!-- This system property is loaded by AbstractDSpaceTest to initialize the test environment -->
-                                <dspace.dir>${agnostic.build.dir}/testing/dspace/</dspace.dir>
-                                <!-- Turn off any DSpace logging -->
-                                <dspace.log.init.disable>true</dspace.log.init.disable>
-                                <solr.install.dir>${agnostic.build.dir}/testing/dspace/solr/</solr.install.dir>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-
-                    <!-- Run Integration Testing! This plugin just kicks off the tests (when enabled). -->
-                    <plugin>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <!-- Specify the dspace.dir to use for test environment -->
-                                <dspace.dir>${agnostic.build.dir}/testing/dspace/</dspace.dir>
-                                <!-- Turn off any DSpace logging -->
-                                <dspace.log.init.disable>true</dspace.log.init.disable>
-                                <solr.install.dir>${agnostic.build.dir}/testing/dspace/solr/</solr.install.dir>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-
-        </profile>
-    </profiles>
-
     <build>
         <plugins>
             <plugin>
@@ -187,9 +72,160 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <!-- This plugin allows us to run a Groovy script in our Maven POM
+                 (see: https://groovy.github.io/gmaven/groovy-maven-plugin/execute.html )
+                 We are generating a OS-agnostic version (agnostic.build.dir) of
+                 the ${project.build.directory} property (full path of target dir).
+                 This is needed by the Surefire & Failsafe plugins (see below)
+                 to initialize the Unit Test environment's dspace.cfg file.
+                 Otherwise, the Unit Test Framework will not work on Windows OS.
+                 This Groovy code was mostly borrowed from:
+                 http://stackoverflow.com/questions/3872355/how-to-convert-file-separator-in-maven
+            -->
+            <plugin>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>setproperty</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+                                project.properties['agnostic.build.dir'] = project.build.directory.replace(File.separator, '/');
+                                log.info("Initializing Maven property 'agnostic.build.dir' to: {}", project.properties['agnostic.build.dir']);
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
+    <profiles>
+        <!-- Setup the Unit Test Environment (when -DskipUnitTests=false) -->
+        <profile>
+            <id>unit-test-environment</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>skipUnitTests</name>
+                    <value>false</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- Unit Testing setup: This plugin unzips the
+                         'testEnvironment.zip' file (created by dspace-parent POM), into
+                         the 'target/testing/' folder, to essentially create a test
+                         install of DSpace, against which Tests can be run. -->
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/testing</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.dspace</groupId>
+                                    <artifactId>dspace-parent</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                    <classifier>testEnvironment</classifier>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>setupUnitTestEnvironment</id>
+                                <phase>generate-test-resources</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!-- Run Unit Testing! This plugin just kicks off the tests -->
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <!-- Specify the dspace.dir to use for test environment -->
+                                <!-- This system property is loaded by AbstractDSpaceTest to initialize the test environment -->
+                                <dspace.dir>${agnostic.build.dir}/testing/dspace/</dspace.dir>
+                                <!-- Turn off any DSpace logging -->
+                                <dspace.log.init.disable>true</dspace.log.init.disable>
+                                <solr.install.dir>${agnostic.build.dir}/testing/dspace/solr/</solr.install.dir>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+
+        </profile>
+
+        <!-- Setup the Integration Test Environment (when -DskipIntegrationTests=false) -->
+        <profile>
+            <id>integration-test-environment</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>skipIntegrationTests</name>
+                    <value>false</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- Integration Testing setup: This plugin unzips the
+                         'testEnvironment.zip' file (created by dspace-parent POM), into
+                         the 'target/testing/' folder, to essentially create a test
+                         install of DSpace, against which Tests can be run. -->
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/testing</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.dspace</groupId>
+                                    <artifactId>dspace-parent</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                    <classifier>testEnvironment</classifier>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>setupIntegrationTestEnvironment</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!-- Run Integration Testing! This plugin just kicks off the tests (when enabled). -->
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <!-- Specify the dspace.dir to use for test environment -->
+                                <dspace.dir>${agnostic.build.dir}/testing/dspace/</dspace.dir>
+                                <!-- Turn off any DSpace logging -->
+                                <dspace.log.init.disable>true</dspace.log.init.disable>
+                                <solr.install.dir>${agnostic.build.dir}/testing/dspace/solr/</solr.install.dir>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+
+
     <dependencyManagement>
         <dependencies>
             <dependency>
diff --git a/dspace-services/pom.xml b/dspace-services/pom.xml
index 1a355964d2..4b8003368b 100644
--- a/dspace-services/pom.xml
+++ b/dspace-services/pom.xml
@@ -18,21 +18,20 @@
     </properties>
 
     <profiles>
-        <!-- If Unit Testing is enabled, then setup the Unit Test Environment.
-             See also the 'skiptests' profile in Parent POM. -->
+        <!-- Setup the Unit Test Environment (when -DskipUnitTests=false) -->
         <profile>
-            <id>test-environment</id>
+            <id>unit-test-environment</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
                 <property>
-                    <name>skipTests</name>
+                    <name>skipUnitTests</name>
                     <value>false</value>
                 </property>
             </activation>
             <build>
                 <plugins>
                     <!-- This plugin allows us to run a Groovy script in our Maven POM
-                         (see: http://gmaven.codehaus.org/Executing+Groovy+Code )
+                         (see: https://groovy.github.io/gmaven/groovy-maven-plugin/execute.html )
                          We are generating a OS-agnostic version (agnostic.build.dir) of
                          the ${project.build.directory} property (full path of target dir).
                          This is needed by the Surefire plugin (see below) to
@@ -59,21 +58,9 @@
                                 </configuration>
                             </execution>
                         </executions>
-                        <!-- TODO: When Groovy 3.0.0 is released, we should upgrade to fix this warning
-                             (which appears in Maven builds) https://issues.apache.org/jira/browse/GROOVY-8339
-                             The below (commented out) dependency should let us upgrade to v3.0.0 once released. -->
-                        <!--<dependencies>
-                            <dependency>
-                                <groupId>org.codehaus.groovy</groupId>
-                                <artifactId>groovy-all</artifactId>
-                                <version>3.0.0</version>
-                                <scope>runtime</scope>
-                                <type>pom</type>
-                            </dependency>
-                        </dependencies>-->
                     </plugin>
 
-                    <!-- Run Unit Testing! This plugin just kicks off the tests (when enabled). -->
+                    <!-- Run Unit Testing! This plugin just kicks off the tests. -->
                     <plugin>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
diff --git a/dspace/modules/additions/pom.xml b/dspace/modules/additions/pom.xml
index fe2a181a40..5ec2a3d11c 100644
--- a/dspace/modules/additions/pom.xml
+++ b/dspace/modules/additions/pom.xml
@@ -26,6 +26,40 @@
        <root.basedir>${basedir}/../../..</root.basedir>
    </properties>
 
+   <build>
+      <plugins>
+         <!-- This plugin allows us to run a Groovy script in our Maven POM
+                 (see: https://groovy.github.io/gmaven/groovy-maven-plugin/execute.html )
+                 We are generating a OS-agnostic version (agnostic.build.dir) of
+                 the ${project.build.directory} property (full path of target dir).
+                 This is needed by the Surefire & Failsafe plugins (see below)
+                 to initialize the Unit Test environment's dspace.cfg file.
+                 Otherwise, the Unit Test Framework will not work on Windows OS.
+                 This Groovy code was mostly borrowed from:
+                 http://stackoverflow.com/questions/3872355/how-to-convert-file-separator-in-maven
+            -->
+         <plugin>
+            <groupId>org.codehaus.gmaven</groupId>
+            <artifactId>groovy-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>setproperty</id>
+                  <phase>initialize</phase>
+                  <goals>
+                     <goal>execute</goal>
+                  </goals>
+                  <configuration>
+                     <source>
+                        project.properties['agnostic.build.dir'] = project.build.directory.replace(File.separator, '/');
+                        log.info("Initializing Maven property 'agnostic.build.dir' to: {}", project.properties['agnostic.build.dir']);
+                     </source>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+
    <profiles>
       <profile>
          <id>oracle-support</id>
@@ -42,20 +76,20 @@
             </dependency>
          </dependencies>
       </profile>
-      <!-- If Unit Testing is enabled, then setup the Unit Test Environment.
-           See also the 'skiptests' profile in Parent POM. -->
+
+      <!-- Setup the Unit Test Environment (when -DskipUnitTests=false) -->
       <profile>
-         <id>test-environment</id>
+         <id>unit-test-environment</id>
          <activation>
             <activeByDefault>false</activeByDefault>
             <property>
-               <name>skipTests</name>
+               <name>skipUnitTests</name>
                <value>false</value>
             </property>
          </activation>
          <build>
             <plugins>
-               <!-- Unit/Integration Testing setup: This plugin unzips the
+               <!-- Unit Testing setup: This plugin unzips the
                     'testEnvironment.zip' file (created by dspace-parent POM), into
                     the 'target/testing/' folder, to essentially create a test
                     install of DSpace, against which Tests can be run. -->
@@ -75,50 +109,12 @@
                   </configuration>
                   <executions>
                      <execution>
-                        <id>setupTestEnvironment</id>
+                        <id>setupUnitTestEnvironment</id>
                         <phase>generate-test-resources</phase>
                         <goals>
                            <goal>unpack</goal>
                         </goals>
                      </execution>
-                     <execution>
-                        <id>setupIntegrationTestEnvironment</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                           <goal>unpack</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-
-               <!-- This plugin allows us to run a Groovy script in our Maven POM
-                    (see: http://gmaven.codehaus.org/Executing+Groovy+Code )
-                    We are generating a OS-agnostic version (agnostic.build.dir) of
-                    the ${project.build.directory} property (full path of target dir).
-                    This is needed by the FileWeaver & Surefire plugins (see below)
-                    to initialize the Unit Test environment's dspace.cfg file.
-                    Otherwise, the Unit Test Framework will not work on Windows OS.
-                    This Groovy code was mostly borrowed from:
-                    http://stackoverflow.com/questions/3872355/how-to-convert-file-separator-in-maven
-               -->
-               <plugin>
-                  <groupId>org.codehaus.gmaven</groupId>
-                  <artifactId>groovy-maven-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>setproperty</id>
-                        <phase>generate-test-resources
-                        </phase> <!-- XXX I think this should be 'initialize' - MHW -->
-                        <goals>
-                           <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                           <source>
-                              project.properties['agnostic.build.dir'] = project.build.directory.replace(File.separator, '/');
-                              println("Initializing Maven property 'agnostic.build.dir' to: " + project.properties['agnostic.build.dir']);
-                           </source>
-                        </configuration>
-                     </execution>
                   </executions>
                </plugin>
 
@@ -136,6 +132,60 @@
                      </systemPropertyVariables>
                   </configuration>
                </plugin>
+            </plugins>
+         </build>
+         <dependencies>
+            <!-- When running tests, also include test classes from dspace-api
+                     (this test-jar is only built when tests are enabled). -->
+            <dependency>
+               <groupId>org.dspace</groupId>
+               <artifactId>dspace-api</artifactId>
+               <type>test-jar</type>
+               <scope>test</scope>
+            </dependency>
+         </dependencies>
+      </profile>
+
+      <!-- Setup the Integration Test Environment (when -DskipIntegrationTests=false) -->
+      <profile>
+         <id>integration-test-environment</id>
+         <activation>
+            <activeByDefault>false</activeByDefault>
+            <property>
+               <name>skipIntegrationTests</name>
+               <value>false</value>
+            </property>
+         </activation>
+         <build>
+            <plugins>
+               <!-- Integration Testing setup: This plugin unzips the
+                    'testEnvironment.zip' file (created by dspace-parent POM), into
+                    the 'target/testing/' folder, to essentially create a test
+                    install of DSpace, against which Tests can be run. -->
+               <plugin>
+                  <artifactId>maven-dependency-plugin</artifactId>
+                  <configuration>
+                     <outputDirectory>${project.build.directory}/testing</outputDirectory>
+                     <artifactItems>
+                        <artifactItem>
+                           <groupId>org.dspace</groupId>
+                           <artifactId>dspace-parent</artifactId>
+                           <version>${project.version}</version>
+                           <type>zip</type>
+                           <classifier>testEnvironment</classifier>
+                        </artifactItem>
+                     </artifactItems>
+                  </configuration>
+                  <executions>
+                     <execution>
+                        <id>setupIntegrationTestEnvironment</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                           <goal>unpack</goal>
+                        </goals>
+                     </execution>
+                  </executions>
+               </plugin>
 
                <!-- Run Integration Testing! This plugin just kicks off the tests (when enabled). -->
                <plugin>
@@ -163,6 +213,7 @@
             </dependency>
          </dependencies>
       </profile>
+
    </profiles>
 
    <!--
diff --git a/dspace/modules/server/pom.xml b/dspace/modules/server/pom.xml
index d60cc32c8c..a255a6eb59 100644
--- a/dspace/modules/server/pom.xml
+++ b/dspace/modules/server/pom.xml
@@ -73,24 +73,52 @@ just adding new jar in the classloader</description>
                     </execution>
                 </executions>
             </plugin>
+            <!-- This plugin allows us to run a Groovy script in our Maven POM
+                 (see: https://groovy.github.io/gmaven/groovy-maven-plugin/execute.html )
+                 We are generating a OS-agnostic version (agnostic.build.dir) of
+                 the ${project.build.directory} property (full path of target dir).
+                 This is needed by the Surefire & Failsafe plugins (see below)
+                 to initialize the Unit Test environment's dspace.cfg file.
+                 Otherwise, the Unit Test Framework will not work on Windows OS.
+                 This Groovy code was mostly borrowed from:
+                 http://stackoverflow.com/questions/3872355/how-to-convert-file-separator-in-maven
+            -->
+            <plugin>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>setproperty</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+                                project.properties['agnostic.build.dir'] = project.build.directory.replace(File.separator, '/');
+                                log.info("Initializing Maven property 'agnostic.build.dir' to: {}", project.properties['agnostic.build.dir']);
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
     <profiles>
-        <!-- If Unit Testing is enabled, then setup the Unit Test Environment.
-             See also the 'skiptests' profile in Parent POM. -->
+        <!-- Setup the Unit Test Environment (when -DskipUnitTests=false) -->
         <profile>
-            <id>test-environment</id>
+            <id>unit-test-environment</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
                 <property>
-                    <name>skipTests</name>
+                    <name>skipUnitTests</name>
                     <value>false</value>
                 </property>
             </activation>
             <build>
                 <plugins>
-                    <!-- Unit/Integration Testing setup: This plugin unzips the
+                    <!-- Unit Testing setup: This plugin unzips the
                          'testEnvironment.zip' file (created by dspace-parent POM), into
                          the 'target/testing/' folder, to essentially create a test
                          install of DSpace, against which Tests can be run. -->
@@ -110,49 +138,12 @@ just adding new jar in the classloader</description>
                         </configuration>
                         <executions>
                             <execution>
-                                <id>setupTestEnvironment</id>
+                                <id>setupUnitTestEnvironment</id>
                                 <phase>generate-test-resources</phase>
                                 <goals>
                                     <goal>unpack</goal>
                                 </goals>
                             </execution>
-                            <execution>
-                                <id>setupIntegrationTestEnvironment</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <!-- This plugin allows us to run a Groovy script in our Maven POM
-                         (see: http://gmaven.codehaus.org/Executing+Groovy+Code )
-                         We are generating a OS-agnostic version (agnostic.build.dir) of
-                         the ${project.build.directory} property (full path of target dir).
-                         This is needed by the FileWeaver & Surefire plugins (see below)
-                         to initialize the Unit Test environment's dspace.cfg file.
-                         Otherwise, the Unit Test Framework will not work on Windows OS.
-                         This Groovy code was mostly borrowed from:
-                         http://stackoverflow.com/questions/3872355/how-to-convert-file-separator-in-maven
-                    -->
-                    <plugin>
-                        <groupId>org.codehaus.gmaven</groupId>
-                        <artifactId>groovy-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>setproperty</id>
-                                <phase>initialize</phase>
-                                <goals>
-                                    <goal>execute</goal>
-                                </goals>
-                                <configuration>
-                                    <source>
-                                        project.properties['agnostic.build.dir'] = project.build.directory.replace(File.separator, '/');
-                                        log.info("Initializing Maven property 'agnostic.build.dir' to: {}", project.properties['agnostic.build.dir']);
-                                    </source>
-                                </configuration>
-                            </execution>
                         </executions>
                     </plugin>
 
@@ -171,6 +162,60 @@ just adding new jar in the classloader</description>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <!-- When running tests, also include test classes from dspace-server-webapp
+                     (this test-jar is only built when tests are enabled). -->
+                <dependency>
+                    <groupId>org.dspace</groupId>
+                    <artifactId>dspace-server-webapp</artifactId>
+                    <type>test-jar</type>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <!-- Setup the Integration Test Environment (when -DskipIntegrationTests=false) -->
+        <profile>
+            <id>integration-test-environment</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>skipIntegrationTests</name>
+                    <value>false</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- Integration Testing setup: This plugin unzips the
+                         'testEnvironment.zip' file (created by dspace-parent POM), into
+                         the 'target/testing/' folder, to essentially create a test
+                         install of DSpace, against which Tests can be run. -->
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/testing</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.dspace</groupId>
+                                    <artifactId>dspace-parent</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                    <classifier>testEnvironment</classifier>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>setupIntegrationTestEnvironment</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
 
                     <!-- Run Integration Testing! This plugin just kicks off the tests (when enabled). -->
                     <plugin>
@@ -199,6 +244,7 @@ just adding new jar in the classloader</description>
                 </dependency>
             </dependencies>
         </profile>
+
         <profile>
             <id>oracle-support</id>
             <activation>
diff --git a/dspace/pom.xml b/dspace/pom.xml
index 58f1af66b5..00a6ec7fb2 100644
--- a/dspace/pom.xml
+++ b/dspace/pom.xml
@@ -148,30 +148,28 @@
            </build>
         </profile>
 
-        <!-- Profile to aggregate (local) code coverage reports via JaCoCo
-             (jacoco.org) during the Unit and Integration testing process.
-             This profile is only enabled when tests are (skipTests=false).
+        <!-- Profile to aggregate (local) code coverage reports created by JaCoCo (jacoco.org)
+             during the Unit and Integration testing processes.
+             This plugin is disabled by default, as it is triggered by name in [src]/.travis.yml
              See also jacoco-maven-plugin settings in Parent POM, as those
-             settings generate the reports aggregated here. -->
+             settings generate the module-specific reports that are aggregated here. -->
         <profile>
-            <id>test-coverage-report</id>
+            <id>coverage-report</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
-                <property>
-                    <name>skipTests</name>
-                    <value>false</value>
-                </property>
             </activation>
             <build>
                 <plugins>
-                    <!-- Aggregate unit test code coverage reports -->
+                    <!-- Aggregate all test code coverage reports from the individual module coverage reports
+                         that are generated during unit & integration testing.
+                         Results (HTML and XML) are written to ./target/site/jacoco-aggregate/ -->
                     <plugin>
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>aggregate-test-report</id>
-                                <phase>post-integration-test</phase>
+                                <phase>verify</phase>
                                 <goals>
                                     <goal>report-aggregate</goal>
                                 </goals>
@@ -182,8 +180,6 @@
                                         <dataFileInclude>**/jacoco-ut.exec</dataFileInclude>
                                         <dataFileInclude>**/jacoco-it.exec</dataFileInclude>
                                     </dataFileIncludes>
-                                    <!-- Sets the output directory for the code coverage report. -->
-                                    <outputDirectory>${project.reporting.outputDirectory}/jacoco-aggregated</outputDirectory>
                                 </configuration>
                             </execution>
                         </executions>
@@ -231,50 +227,6 @@
                 </dependency>
             </dependencies>
         </profile>
-
-        <!-- Send coverage reports (generated by jacoco-maven-plugin) to coveralls.io. See 'test-coverage-report'
-             profile above for more details on aggregating of code coverage reports.
-             This plugin is disabled by default, as it is triggered by name in [src]/.travis.yml -->
-        <profile>
-            <id>coveralls</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.eluder.coveralls</groupId>
-                        <artifactId>coveralls-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>report-test-coverage</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>report</goal>
-                                </goals>
-                                <configuration>
-                                    <failOnServiceError>false</failOnServiceError>
-                                    <jacocoReports>
-                                        <jacocoReport>${project.reporting.outputDirectory}/jacoco-aggregated/jacoco.xml</jacocoReport>
-                                    </jacocoReports>
-                                    <sourceDirectories>
-                                        <sourceDirectory>${project.parent.basedir}/dspace-api/src/main/java</sourceDirectory>
-                                        <sourceDirectory>${project.parent.basedir}/dspace-api/target/generated-sources/annotations</sourceDirectory>
-                                        <sourceDirectory>${project.parent.basedir}/dspace-oai/src/main/java</sourceDirectory>
-                                        <sourceDirectory>${project.parent.basedir}/dspace-rdf/src/main/java</sourceDirectory>
-                                        <sourceDirectory>${project.parent.basedir}/dspace-rest/src/main/java</sourceDirectory>
-                                        <sourceDirectory>${project.parent.basedir}/dspace-services/src/main/java</sourceDirectory>
-                                        <sourceDirectory>${project.parent.basedir}/dspace-server-webapp/src/main/java</sourceDirectory>
-                                        <sourceDirectory>${project.parent.basedir}/dspace-sword/src/main/java</sourceDirectory>
-                                        <sourceDirectory>${project.parent.basedir}/dspace-swordv2/src/main/java</sourceDirectory>
-                                    </sourceDirectories>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index f0b3158982..9e5cea3ba4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,17 @@
         <!--=== MAVEN SETTINGS ===-->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
+
+        <!--=== TEST SETTINGS (CUSTOM) ===-->
+        <!-- By default skip running all tests.
+             NOTE: Tests are always built, because we have modules that depend on common test infrastructure.
+             * Run all tests : 'mvn install -DskipUnitTests=false -DskipIntegrationTests=false'
+             * Run unit tests ONLY: 'mvn install -DskipUnitTests=false'
+             * Run integration tests ONLY: `mvn install -DskipIntegrationTests=false'
+        -->
+        <skipUnitTests>true</skipUnitTests>
+        <skipIntegrationTests>true</skipIntegrationTests>
+
         <!-- 'root.basedir' is the path to the root [dspace-src] dir. It must be redefined by each child POM,
                      as it is used to reference the LICENSE_HEADER and *.properties file(s) in that directory. -->
         <root.basedir>${basedir}</root.basedir>
@@ -160,7 +171,7 @@
                         </archive>
                     </configuration>
                 </plugin>
-                <!-- Used to run Unit tests (when -Dskiptests=false) -->
+                <!-- Used to run Unit tests (when enabled by -DskipUnitTests=false) -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -177,13 +188,15 @@
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
                         <!-- Ensure full stacktrace is logged (when errors occur) -->
                         <trimStackTrace>false</trimStackTrace>
+                        <!-- Whether to skip unit tests or not -->
+                        <skipTests>${skipUnitTests}</skipTests>
                         <!--
                         Enable to debug Maven Surefire tests in remote proces
                         <debugForkedProcess>true</debugForkedProcess>
                         -->
                     </configuration>
                 </plugin>
-                <!-- Used to run Integration tests (when -Dskipits=false) -->
+                <!-- Used to run Integration tests (when enabled by -DskipIntegrationTests=false) -->
                 <plugin>
                     <artifactId>maven-failsafe-plugin</artifactId>
                     <version>2.22.2</version>
@@ -198,10 +211,11 @@
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
                         <!-- Ensure full stacktrace is logged (when errors occur) -->
                         <trimStackTrace>false</trimStackTrace>
+                        <!-- Whether to skip integration tests or not -->
+                        <skipTests>${skipIntegrationTests}</skipTests>
                     </configuration>
                     <executions>
                         <execution>
-                            <id>integration-test</id>
                             <goals>
                                 <goal>integration-test</goal>
                                 <goal>verify</goal>
@@ -343,21 +357,6 @@
                     <artifactId>jacoco-maven-plugin</artifactId>
                     <version>0.8.5</version>
                 </plugin>
-                <!-- Used to send jacoco coverage reports to coveralls.io (see 'measure-test-coverage' profile) -->
-                <plugin>
-                    <groupId>org.eluder.coveralls</groupId>
-                    <artifactId>coveralls-maven-plugin</artifactId>
-                    <version>4.3.0</version>
-                    <!-- Include JAXB API directly to workaround coveralls-maven-plugin bug in Java 9+
-                         https://github.com/trautonen/coveralls-maven-plugin/issues/112 -->
-                    <dependencies>
-                        <dependency>
-                            <groupId>javax.xml.bind</groupId>
-                            <artifactId>jaxb-api</artifactId>
-                            <version>${jaxb-api.version}</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -475,42 +474,6 @@
     </build>
 
     <profiles>
-        <!-- Skip running Unit Tests by default, but allow override on
-             command line by setting property "-DskipTests=false".
-             Tests are always built, because we have modules that depend
-             on common test infrastructure. -->
-        <profile>
-            <id>skiptests</id>
-            <activation>
-                <!-- This profile should be active at all times, unless the
-                     user specifies a different value for "skipTests" -->
-                <property>
-                    <name>!skipTests</name>
-                </property>
-            </activation>
-            <properties>
-                <skipTests>true</skipTests>
-            </properties>
-        </profile>
-
-        <!-- Skip running Integration Tests by default, but allow override on
-             command line by setting property "-DskipITs=false".
-             ITs are always built, because we have modules that depend
-             on common test infrastructure. -->
-        <profile>
-            <id>skipits</id>
-            <activation>
-                <!-- This profile should be active at all times, unless the
-                     user specifies a different value for "skipITs" -->
-                <property>
-                    <name>!skipITs</name>
-                </property>
-            </activation>
-            <properties>
-                <skipITs>true</skipITs>
-            </properties>
-        </profile>
-
         <!-- Allow for passing extra memory to Unit/Integration tests.
              By default this gives unit tests 1GB of memory max (when tests are enabled),
              unless tweaked on commandline (e.g. "-Dtest.argLine=-Xmx512m"). Since
@@ -527,18 +490,11 @@
             </properties>
         </profile>
 
-        <!-- This profile ensures that we ONLY generate the Unit Test Environment,
-             if the testEnvironment.xml file is found AND we are not skipping Unit
-             Tests (see also skiptests profile). That way the Test Environment is
-             also NOT built when running a 'mvn package' on a "binary" release. -->
+        <!-- This profile ensures that we generate the Unit Test Environment, whenever the testEnvironment.xml
+             file is found. This allows us to run Unit & Integration tests separately for CI, etc. -->
         <profile>
-            <id>generate-test-env</id>
+            <id>test-environment</id>
             <activation>
-                <activeByDefault>false</activeByDefault>
-                <property>
-                    <name>skipTests</name>
-                    <value>false</value>
-                </property>
                 <file>
                     <exists>src/main/assembly/testEnvironment.xml</exists>
                 </file>
@@ -571,12 +527,13 @@
             </build>
         </profile>
 
+        <!-- Measure test coverage of Unit Tests using JaCoCo (when -DskipUnitTests=false) -->
         <profile>
-            <id>measure-test-coverage</id>
+            <id>measure-unit-test-coverage</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
                 <property>
-                    <name>skipTests</name>
+                    <name>skipUnitTests</name>
                     <value>false</value>
                 </property>
             </activation>
@@ -606,7 +563,29 @@
                                     <propertyName>surefireJacoco</propertyName>
                                 </configuration>
                             </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
 
+        <!-- Measure test coverage of Integration Tests using JaCoCo (when -DskipIntegrationTests=false) -->
+        <profile>
+            <id>measure-integration-test-coverage</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>skipIntegrationTests</name>
+                    <value>false</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- Report integration test code coverage -->
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <executions>
                             <!--
                                 Prepares the property pointing to the JaCoCo runtime agent which
                                 is passed as VM argument when Maven the Failsafe plugin is executed.