diff --git a/build.gradle b/build.gradle
index 8d80bd574..e1cc2c5f2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -130,7 +130,7 @@ allprojects {
 			':smack-openpgp',
 		].collect { project(it) }
 		junitVersion = '5.4.2'
-		powerMockVersion = '1.7.3'
+		powerMockVersion = '2.0.2'
 	}
 	group = 'org.igniterealtime.smack'
 	sourceCompatibility = JavaVersion.VERSION_1_8
diff --git a/smack-extensions/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/smack-extensions/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 000000000..1f0955d45
--- /dev/null
+++ b/smack-extensions/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline