diff --git a/apache-fop/pom.xml b/apache-fop/pom.xml
index 658d567a90..949843a47e 100644
--- a/apache-fop/pom.xml
+++ b/apache-fop/pom.xml
@@ -97,6 +97,14 @@
 			<version>8.0.2</version>
 		</dependency>
 
+		<dependency>
+		  <groupId>org.dbdoclet</groupId>
+		  <artifactId>herold</artifactId>
+		  <version>6.1.0</version>
+		  <scope>system</scope>
+		  <systemPath>${basedir}/src/test/resources/jars/herold.jar</systemPath>
+		</dependency>
+		
 		<dependency>
 			<groupId>net.sf.jtidy</groupId>
 			<artifactId>jtidy</artifactId>
@@ -132,7 +140,8 @@
 				<version>${maven-surefire-plugin.version}</version>
 				<configuration>
 					<excludes>
-						<exclude>**/*IntegrationTest.java</exclude>
+                        <exclude>**/*IntegrationTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
 					</excludes>
 				</configuration>
 			</plugin>
@@ -141,6 +150,42 @@
 
 	</build>
 
+    <profiles>
+        <profile>
+            <id>integration</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>**/*ManualTest.java</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/*IntegrationTest.java</include>
+                                        <exclude>**/*LiveTest.java</exclude>                                        
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <test.mime>json</test.mime>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    
 	<properties>
 		<!-- persistence -->
 		<hibernate.version>4.3.11.Final</hibernate.version>
diff --git a/apache-fop/src/test/java/org/baeldung/java/ApacheFOPConvertHTMLTest.java b/apache-fop/src/test/java/org/baeldung/java/ApacheFOPConvertHTMLIntegrationTest.java
similarity index 98%
rename from apache-fop/src/test/java/org/baeldung/java/ApacheFOPConvertHTMLTest.java
rename to apache-fop/src/test/java/org/baeldung/java/ApacheFOPConvertHTMLIntegrationTest.java
index bde6868b39..99487c8fdf 100644
--- a/apache-fop/src/test/java/org/baeldung/java/ApacheFOPConvertHTMLTest.java
+++ b/apache-fop/src/test/java/org/baeldung/java/ApacheFOPConvertHTMLIntegrationTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.tidy.Tidy;
 
-public class ApacheFOPConvertHTMLTest {
+public class ApacheFOPConvertHTMLIntegrationTest {
     private String inputFile = "src/test/resources/input.html";
     private String style = "src/test/resources/xhtml2fo.xsl";
     private String style1 = "src/test/resources/docbook-xsl/fo/docbook.xsl";
diff --git a/apache-fop/src/test/java/org/baeldung/java/ApacheFOPHeroldTest.java b/apache-fop/src/test/java/org/baeldung/java/ApacheFOPHeroldLiveTest.java
similarity index 99%
rename from apache-fop/src/test/java/org/baeldung/java/ApacheFOPHeroldTest.java
rename to apache-fop/src/test/java/org/baeldung/java/ApacheFOPHeroldLiveTest.java
index 5e3c2c472b..9e71cd9c16 100644
--- a/apache-fop/src/test/java/org/baeldung/java/ApacheFOPHeroldTest.java
+++ b/apache-fop/src/test/java/org/baeldung/java/ApacheFOPHeroldLiveTest.java
@@ -30,7 +30,7 @@ import org.dbdoclet.trafo.script.Script;
 import org.junit.Test;
 import org.w3c.dom.Document;
 
-public class ApacheFOPHeroldTest {
+public class ApacheFOPHeroldLiveTest {
     private String[] inputUrls = {// @formatter:off
             "http://www.baeldung.com/2011/10/20/bootstraping-a-web-application-with-spring-3-1-and-java-based-configuration-part-1/",
             "http://www.baeldung.com/2011/10/25/building-a-restful-web-service-with-spring-3-1-and-java-based-configuration-part-2/",