diff --git a/build.gradle b/build.gradle
index 77bf4c0b5..bba9dd4ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -98,7 +98,7 @@ allprojects {
 		].collect{ project(it) }
 		androidBootClasspath = getAndroidRuntimeJar()
 		androidJavadocOffline = getAndroidJavadocOffline()
-		junitVersion = '4.11'
+		junitVersion = '5.2.0'
 	}
 	group = 'org.igniterealtime.smack'
 	sourceCompatibility = 1.7
diff --git a/smack-core/build.gradle b/smack-core/build.gradle
index 94ae22e55..0bbd02238 100644
--- a/smack-core/build.gradle
+++ b/smack-core/build.gradle
@@ -16,7 +16,8 @@ dependencies {
 	compile "org.jxmpp:jxmpp-jid:$jxmppVersion"
 	compile "org.minidns:minidns-core:$miniDnsVersion"
 	testCompile "org.jxmpp:jxmpp-jid:$jxmppVersion:tests"
-	testCompile "junit:junit:$junitVersion"
+	testCompile "org.junit.jupiter:junit-jupiter-api:$junitVersion"
+	testCompile "org.junit.vintage:junit-vintage-engine:$junitVersion"
 	testCompile "org.xmlunit:xmlunit-core:$xmlUnitVersion"
 	testCompile "org.xmlunit:xmlunit-legacy:$xmlUnitVersion"
 	testCompile "org.powermock:powermock-module-junit4:1.6.4"
diff --git a/smack-integration-test/build.gradle b/smack-integration-test/build.gradle
index 65ff935e2..0d4d197df 100644
--- a/smack-integration-test/build.gradle
+++ b/smack-integration-test/build.gradle
@@ -15,7 +15,11 @@ dependencies {
 	compile project(':smack-debug')
 	compile 'org.reflections:reflections:0.9.9-RC1'
 	compile 'eu.geekplace.javapinning:java-pinning-java7:1.1.0-alpha1'
-	compile "junit:junit:$junitVersion"
+	// Note that the junit-vintage-engine runtime dependency is not
+	// directly required, but it declares a dependency to
+	// junit:junit:4.12, which we currently need in sinttest, since it
+	// (ab)uses @Before from org.junit
+	compile "org.junit.vintage:junit-vintage-engine:$junitVersion"
 	testCompile "org.jxmpp:jxmpp-jid:$jxmppVersion:tests"
 }