diff --git a/pom.xml b/pom.xml
index 114f5e2..5125fef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
     <version>0.5.3-SNAPSHOT</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <jmockit.version>1.44</jmockit.version>
     </properties>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -163,178 +164,184 @@
         </snapshotRepository>
     </distributionManagement>
 
-    <build>
-        <plugins>
-        			<plugin>
+	<build>
+		<plugins>
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.0.0-M1</version>
+				<configuration>
+					<argLine>
+						-javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
+					</argLine>
+				</configuration>
 			</plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>false</autoReleaseAfterClose>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <mainClass>JavaFXLibrary</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.0.0</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>JavaFXLibrary</mainClass>
-                        </manifest>
-                    </archive>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.robotframework</groupId>
-                <artifactId>robotframework-maven-plugin</artifactId>
-                <version>1.4.7</version>
-                <executions>
-                    <execution>
-                        <id>acceptance tests</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <includes>
-                                <include>smoke</include>
-                            </includes>
-                            <excludes>
-                                <exclude>not-ready</exclude>
-                            </excludes>
-                            <logLevel>TRACE:INFO</logLevel>
-                            <dryrun>false</dryrun>
-                            <variables>
-                            	<variable>appJar:${project.build.directory}/${project.artifactId}*tests.jar</variable>
-                            </variables>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>documentation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>libdoc</goal>
-                        </goals>
-                        <configuration>
-                            <libdoc>
-                                <outputDirectory>${project.build.directory}</outputDirectory>
-                                <outputFile>${project.artifactId}.html</outputFile>
-                                <libraryOrResourceFile>JavaFXLibrary</libraryOrResourceFile>
-                                <version>${project.version}</version>
-                            </libdoc>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>xml</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>libdoc</goal>
-                        </goals>
-                        <configuration>
-                            <libdoc>
-                                <outputDirectory>${project.build.directory}</outputDirectory>
-                                <outputFile>${project.artifactId}.xml</outputFile>
-                                <libraryOrResourceFile>JavaFXLibrary</libraryOrResourceFile>
-                                <version>${project.version}</version>
-                            </libdoc>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>JavaFXLibrary</mainClass>
-                                </transformer>
-                            </transformers>
-                            <relocations>
-                                <relocation>
-                                    <pattern>com.google.common</pattern>
-                                    <shadedPattern>shaded.com.google.common</shadedPattern>
-                                </relocation>
-                              	<relocation>
-	                                <pattern>org.apache.commons</pattern>
-	                                <shadedPattern>shaded.org.apache.commons</shadedPattern>
-                                </relocation>
-                            </relocations>
-                            <artifactSet>
-                                <includes>
-                                    <include>*:*</include>
-                                </includes>
-                            </artifactSet>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+			<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+				<version>1.6.7</version>
+				<extensions>true</extensions>
+				<configuration>
+					<serverId>ossrh</serverId>
+					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+					<autoReleaseAfterClose>false</autoReleaseAfterClose>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.6.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.0.2</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<mainClass>JavaFXLibrary</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.0.0</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>JavaFXLibrary</mainClass>
+						</manifest>
+					</archive>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.robotframework</groupId>
+				<artifactId>robotframework-maven-plugin</artifactId>
+				<version>1.4.7</version>
+				<executions>
+					<execution>
+						<id>acceptance tests</id>
+						<phase>integration-test</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<includes>
+								<include>smoke</include>
+							</includes>
+							<excludes>
+								<exclude>not-ready</exclude>
+							</excludes>
+							<logLevel>TRACE:INFO</logLevel>
+							<dryrun>false</dryrun>
+							<variables>
+								<variable>appJar:${project.build.directory}/${project.artifactId}*tests.jar</variable>
+							</variables>
+						</configuration>
+					</execution>
+					<execution>
+						<id>documentation</id>
+						<phase>package</phase>
+						<goals>
+							<goal>libdoc</goal>
+						</goals>
+						<configuration>
+							<libdoc>
+								<outputDirectory>${project.build.directory}</outputDirectory>
+								<outputFile>${project.artifactId}.html</outputFile>
+								<libraryOrResourceFile>JavaFXLibrary</libraryOrResourceFile>
+								<version>${project.version}</version>
+							</libdoc>
+						</configuration>
+					</execution>
+					<execution>
+						<id>xml</id>
+						<phase>package</phase>
+						<goals>
+							<goal>libdoc</goal>
+						</goals>
+						<configuration>
+							<libdoc>
+								<outputDirectory>${project.build.directory}</outputDirectory>
+								<outputFile>${project.artifactId}.xml</outputFile>
+								<libraryOrResourceFile>JavaFXLibrary</libraryOrResourceFile>
+								<version>${project.version}</version>
+							</libdoc>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>3.1.0</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<transformers>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>JavaFXLibrary</mainClass>
+								</transformer>
+							</transformers>
+							<relocations>
+								<relocation>
+									<pattern>com.google.common</pattern>
+									<shadedPattern>shaded.com.google.common</shadedPattern>
+								</relocation>
+								<relocation>
+									<pattern>org.apache.commons</pattern>
+									<shadedPattern>shaded.org.apache.commons</shadedPattern>
+								</relocation>
+							</relocations>
+							<artifactSet>
+								<includes>
+									<include>*:*</include>
+								</includes>
+							</artifactSet>
+							<filters>
+								<filter>
+									<artifact>*:*</artifact>
+									<excludes>
+										<exclude>META-INF/*.SF</exclude>
+										<exclude>META-INF/*.DSA</exclude>
+										<exclude>META-INF/*.RSA</exclude>
+									</excludes>
+								</filter>
+							</filters>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 
     <dependencies>
         <dependency>
@@ -346,7 +353,7 @@
             <groupId>org.jmockit</groupId>
             <artifactId>jmockit</artifactId>
             <scope>test</scope>
-            <version>1.38</version>
+            <version>${jmockit.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>