diff --git a/pom.xml b/pom.xml
index 0259a38..61dd699 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.target>1.7</maven.compiler.target>
         <maven.compiler.source>1.7</maven.compiler.source>
     </properties>
@@ -82,19 +83,45 @@
                 </dependencies>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.5</version>
+                <version>2.19.1</version>
                 <configuration>
                     <includes>
                         <include>**/*.java</include>
                     </includes>
                     <excludes>
+                        <!--Integration tests -->
+                        <exclude>se.vidstige.jadb.test.integration.*</exclude>
+                        <!--Mocks and data-->
                         <exclude>**/data/*</exclude>
                         <exclude>**/fakes/*</exclude>
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.19.1</version>
+                <configuration>
+                    <includes>
+                        <include>**/*.java</include>
+                    </includes>
+                    <excludes>
+                        <!--Integration tests -->
+                        <exclude>se.vidstige.jadb.test.unit.*</exclude>
+                        <!--Mocks and data-->
+                        <exclude>**/data/*</exclude>
+                        <exclude>**/fakes/*</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/test/se/vidstige/jadb/test/PackageMangerTests.java b/test/se/vidstige/jadb/test/integration/PackageMangerTests.java
similarity index 97%
rename from test/se/vidstige/jadb/test/PackageMangerTests.java
rename to test/se/vidstige/jadb/test/integration/PackageMangerTests.java
index 45db079..b985d7f 100644
--- a/test/se/vidstige/jadb/test/PackageMangerTests.java
+++ b/test/se/vidstige/jadb/test/integration/PackageMangerTests.java
@@ -1,4 +1,4 @@
-package se.vidstige.jadb.test;
+package se.vidstige.jadb.test.integration;
 
 import org.junit.Before;
 import org.junit.BeforeClass;
diff --git a/test/se/vidstige/jadb/test/RealDeviceTestCases.java b/test/se/vidstige/jadb/test/integration/RealDeviceTestCases.java
similarity index 98%
rename from test/se/vidstige/jadb/test/RealDeviceTestCases.java
rename to test/se/vidstige/jadb/test/integration/RealDeviceTestCases.java
index 5acd858..aaa222e 100644
--- a/test/se/vidstige/jadb/test/RealDeviceTestCases.java
+++ b/test/se/vidstige/jadb/test/integration/RealDeviceTestCases.java
@@ -1,4 +1,4 @@
-package se.vidstige.jadb.test;
+package se.vidstige.jadb.test.integration;
 
 import org.junit.Before;
 import org.junit.BeforeClass;
diff --git a/test/se/vidstige/jadb/test/AdbInputStreamFixture.java b/test/se/vidstige/jadb/test/unit/AdbInputStreamFixture.java
similarity index 97%
rename from test/se/vidstige/jadb/test/AdbInputStreamFixture.java
rename to test/se/vidstige/jadb/test/unit/AdbInputStreamFixture.java
index 37aa4b2..1aabb81 100644
--- a/test/se/vidstige/jadb/test/AdbInputStreamFixture.java
+++ b/test/se/vidstige/jadb/test/unit/AdbInputStreamFixture.java
@@ -1,4 +1,4 @@
-package se.vidstige.jadb.test;
+package se.vidstige.jadb.test.unit;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/test/se/vidstige/jadb/test/AdbOutputStreamFixture.java b/test/se/vidstige/jadb/test/unit/AdbOutputStreamFixture.java
similarity index 97%
rename from test/se/vidstige/jadb/test/AdbOutputStreamFixture.java
rename to test/se/vidstige/jadb/test/unit/AdbOutputStreamFixture.java
index 9d6c5df..5dae716 100644
--- a/test/se/vidstige/jadb/test/AdbOutputStreamFixture.java
+++ b/test/se/vidstige/jadb/test/unit/AdbOutputStreamFixture.java
@@ -1,4 +1,4 @@
-package se.vidstige.jadb.test;
+package se.vidstige.jadb.test.unit;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/test/se/vidstige/jadb/test/MockedTestCases.java b/test/se/vidstige/jadb/test/unit/MockedTestCases.java
similarity index 99%
rename from test/se/vidstige/jadb/test/MockedTestCases.java
rename to test/se/vidstige/jadb/test/unit/MockedTestCases.java
index d6cd3e3..f311818 100644
--- a/test/se/vidstige/jadb/test/MockedTestCases.java
+++ b/test/se/vidstige/jadb/test/unit/MockedTestCases.java
@@ -1,4 +1,4 @@
-package se.vidstige.jadb.test;
+package se.vidstige.jadb.test.unit;
 
 import org.junit.After;
 import org.junit.Assert;