diff --git a/README.md b/README.md
index afcf96ce..965fb94a 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ You need JRE 8 or newer.  After installing that and setting up the appropriate p
 ./gradlew clean assemble
 ```
 
-If you want to run the unit tests, some of which will fail, type
+If you want to run the unit tests, type
 ```
 ./gradlew clean build
 ```
diff --git a/gui/build.gradle b/gui/build.gradle
index f3bc8480..2a9b7bb1 100644
--- a/gui/build.gradle
+++ b/gui/build.gradle
@@ -44,9 +44,9 @@ mainClassName = 'com.muwire.gui.Launcher'
 applicationDefaultJvmArgs = ['-Djava.util.logging.config.file=logging.properties']
 
 apply from: 'gradle/publishing.gradle'
-apply from: 'gradle/code-coverage.gradle'
-apply from: 'gradle/code-quality.gradle'
-apply from: 'gradle/integration-test.gradle'
+// apply from: 'gradle/code-coverage.gradle'
+// apply from: 'gradle/code-quality.gradle'
+// apply from: 'gradle/integration-test.gradle'
 // apply from: 'gradle/package.gradle'
 apply from: 'gradle/docs.gradle'
 apply plugin: 'com.github.johnrengelman.shadow'
@@ -119,6 +119,7 @@ if (hasProperty('debugRun') && ((project.debugRun as boolean))) {
     }
 }
 
+/*
 task jacocoRootMerge(type: org.gradle.testing.jacoco.tasks.JacocoMerge, dependsOn: [test, jacocoTestReport, jacocoIntegrationTestReport]) {
     executionData = files(jacocoTestReport.executionData, jacocoIntegrationTestReport.executionData)
     destinationFile = file("${buildDir}/jacoco/root.exec")
@@ -138,4 +139,5 @@ task jacocoRootReport(dependsOn: jacocoRootMerge, type: JacocoReport) {
         xml.destination = file("${buildDir}/reports/jacoco/root/root.xml")
     }
 }
+*/
 
diff --git a/gui/src/test/groovy/com/muwire/gui/ContentPanelControllerTest.groovy b/gui/src/test/groovy/com/muwire/gui/ContentPanelControllerTest.groovy
deleted file mode 100644
index 1ad0b29d..00000000
--- a/gui/src/test/groovy/com/muwire/gui/ContentPanelControllerTest.groovy
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.muwire.gui
-
-import griffon.core.test.GriffonUnitRule
-import griffon.core.test.TestFor
-import org.junit.Rule
-import org.junit.Test
-
-import static org.junit.Assert.fail
-
-@TestFor(ContentPanelController)
-class ContentPanelControllerTest {
-    private ContentPanelController controller
-
-    @Rule
-    public final GriffonUnitRule griffon = new GriffonUnitRule()
-
-    @Test
-    void smokeTest() {
-        fail('Not yet implemented!')
-    }
-}
\ No newline at end of file
diff --git a/gui/src/test/groovy/com/muwire/gui/EventListControllerTest.groovy b/gui/src/test/groovy/com/muwire/gui/EventListControllerTest.groovy
deleted file mode 100644
index c4b18d87..00000000
--- a/gui/src/test/groovy/com/muwire/gui/EventListControllerTest.groovy
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.muwire.gui
-
-import griffon.core.test.GriffonUnitRule
-import griffon.core.test.TestFor
-import org.junit.Rule
-import org.junit.Test
-
-import static org.junit.Assert.fail
-
-@TestFor(EventListController)
-class EventListControllerTest {
-    private EventListController controller
-
-    @Rule
-    public final GriffonUnitRule griffon = new GriffonUnitRule()
-
-    @Test
-    void smokeTest() {
-        fail('Not yet implemented!')
-    }
-}
\ No newline at end of file
diff --git a/gui/src/test/groovy/com/muwire/gui/I2PStatusControllerTest.groovy b/gui/src/test/groovy/com/muwire/gui/I2PStatusControllerTest.groovy
deleted file mode 100644
index 8bead08c..00000000
--- a/gui/src/test/groovy/com/muwire/gui/I2PStatusControllerTest.groovy
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.muwire.gui
-
-import griffon.core.test.GriffonUnitRule
-import griffon.core.test.TestFor
-import org.junit.Rule
-import org.junit.Test
-
-import static org.junit.Assert.fail
-
-@TestFor(I2PStatusController)
-class I2PStatusControllerTest {
-    private I2PStatusController controller
-
-    @Rule
-    public final GriffonUnitRule griffon = new GriffonUnitRule()
-
-    @Test
-    void smokeTest() {
-        fail('Not yet implemented!')
-    }
-}
\ No newline at end of file
diff --git a/gui/src/test/groovy/com/muwire/gui/MainFrameControllerTest.groovy b/gui/src/test/groovy/com/muwire/gui/MainFrameControllerTest.groovy
deleted file mode 100644
index ab3a546e..00000000
--- a/gui/src/test/groovy/com/muwire/gui/MainFrameControllerTest.groovy
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.muwire.gui
-
-import griffon.core.test.GriffonUnitRule
-import griffon.core.test.TestFor
-import org.junit.Rule
-import org.junit.Test
-
-import static org.junit.Assert.fail
-
-@TestFor(MainFrameController)
-class MainFrameControllerTest {
-    private MainFrameController controller
-
-    @Rule
-    public final GriffonUnitRule griffon = new GriffonUnitRule()
-
-    @Test
-    void smokeTest() {
-        fail('Not yet implemented!')
-    }
-}
\ No newline at end of file
diff --git a/gui/src/test/groovy/com/muwire/gui/MuWireStatusControllerTest.groovy b/gui/src/test/groovy/com/muwire/gui/MuWireStatusControllerTest.groovy
deleted file mode 100644
index 2cd13bb2..00000000
--- a/gui/src/test/groovy/com/muwire/gui/MuWireStatusControllerTest.groovy
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.muwire.gui
-
-import griffon.core.test.GriffonUnitRule
-import griffon.core.test.TestFor
-import org.junit.Rule
-import org.junit.Test
-
-import static org.junit.Assert.fail
-
-@TestFor(MuWireStatusController)
-class MuWireStatusControllerTest {
-    private MuWireStatusController controller
-
-    @Rule
-    public final GriffonUnitRule griffon = new GriffonUnitRule()
-
-    @Test
-    void smokeTest() {
-        fail('Not yet implemented!')
-    }
-}
\ No newline at end of file
diff --git a/gui/src/test/groovy/com/muwire/gui/OptionsControllerTest.groovy b/gui/src/test/groovy/com/muwire/gui/OptionsControllerTest.groovy
deleted file mode 100644
index a14f03a1..00000000
--- a/gui/src/test/groovy/com/muwire/gui/OptionsControllerTest.groovy
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.muwire.gui
-
-import griffon.core.test.GriffonUnitRule
-import griffon.core.test.TestFor
-import org.junit.Rule
-import org.junit.Test
-
-import static org.junit.Assert.fail
-
-@TestFor(OptionsController)
-class OptionsControllerTest {
-    private OptionsController controller
-
-    @Rule
-    public final GriffonUnitRule griffon = new GriffonUnitRule()
-
-    @Test
-    void smokeTest() {
-        fail('Not yet implemented!')
-    }
-}
\ No newline at end of file
diff --git a/gui/src/test/groovy/com/muwire/gui/SearchTabControllerTest.groovy b/gui/src/test/groovy/com/muwire/gui/SearchTabControllerTest.groovy
deleted file mode 100644
index 079d4160..00000000
--- a/gui/src/test/groovy/com/muwire/gui/SearchTabControllerTest.groovy
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.muwire.gui
-
-import griffon.core.test.GriffonUnitRule
-import griffon.core.test.TestFor
-import org.junit.Rule
-import org.junit.Test
-
-import static org.junit.Assert.fail
-
-@TestFor(SearchTabController)
-class SearchTabControllerTest {
-    private SearchTabController controller
-
-    @Rule
-    public final GriffonUnitRule griffon = new GriffonUnitRule()
-
-    @Test
-    void smokeTest() {
-        fail('Not yet implemented!')
-    }
-}
\ No newline at end of file
diff --git a/gui/src/test/groovy/com/muwire/gui/TrustListControllerTest.groovy b/gui/src/test/groovy/com/muwire/gui/TrustListControllerTest.groovy
deleted file mode 100644
index cf7ae9f9..00000000
--- a/gui/src/test/groovy/com/muwire/gui/TrustListControllerTest.groovy
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.muwire.gui
-
-import griffon.core.test.GriffonUnitRule
-import griffon.core.test.TestFor
-import org.junit.Rule
-import org.junit.Test
-
-import static org.junit.Assert.fail
-
-@TestFor(TrustListController)
-class TrustListControllerTest {
-    private TrustListController controller
-
-    @Rule
-    public final GriffonUnitRule griffon = new GriffonUnitRule()
-
-    @Test
-    void smokeTest() {
-        fail('Not yet implemented!')
-    }
-}
\ No newline at end of file
diff --git a/host-cache/build.gradle b/host-cache/build.gradle
index 5256f907..ba09c3a1 100644
--- a/host-cache/build.gradle
+++ b/host-cache/build.gradle
@@ -1,3 +1,8 @@
 apply plugin : 'application'
 mainClassName = 'com.muwire.hostcache.HostCache'
 applicationDefaultJvmArgs = ['-Djava.util.logging.config.file=logging.properties']
+
+dependencies {
+    testCompile 'org.junit.jupiter:junit-jupiter-api:5.4.2'
+    testCompile 'junit:junit:4.12'
+}