diff --git a/android-app/pom.xml b/android-app/pom.xml
index f1ab2bfa..fc8d14d1 100644
--- a/android-app/pom.xml
+++ b/android-app/pom.xml
@@ -136,6 +136,19 @@
 
 		<plugins>
 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<forkCount>1</forkCount>
+					<reuseForks>false</reuseForks>
+					<excludes>
+						<exclude>org/solovyev/android/calculator/wizard/*.java</exclude>
+						<exclude>org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
 				<artifactId>android-maven-plugin</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 8e610f52..6c062c2b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -71,18 +71,5 @@
 
 	</dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<forkCount>1</forkCount>
-					<reuseForks>false</reuseForks>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f9303aa9..c8150287 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,7 +288,7 @@
 				<version>2.15</version>
 				<configuration>
 					<forkCount>10</forkCount>
-					<reuseForks>true</reuseForks>
+					<reuseForks>false</reuseForks>
 				</configuration>
 			</plugin>