diff --git a/settings.gradle b/settings.gradle
index 3c549273..1063955c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -41,8 +41,10 @@ project(':LuceneBankingPersistence').projectDir = "$rootDir/persistence/LuceneBa
 /*          Tools           */
 
 include ':BankFinder'
+include ':LuceneBankFinder'
 include ':BankListCreator'
 
 
 project(':BankFinder').projectDir = "$rootDir/tools/BankFinder/" as File
+project(':LuceneBankFinder').projectDir = "$rootDir/tools/LuceneBankFinder/" as File
 project(':BankListCreator').projectDir = "$rootDir/tools/BankListCreator/" as File
diff --git a/tools/BankFinder/build.gradle b/tools/BankFinder/build.gradle
index 2c124cbc..c5394c66 100644
--- a/tools/BankFinder/build.gradle
+++ b/tools/BankFinder/build.gradle
@@ -9,9 +9,7 @@ targetCompatibility = "7"
 
 
 dependencies {
-    implementation project(":BankingUiCommon")
-
-    implementation "net.dankito.search:lucene-4-utils:$luceneUtilsVersion"
+    api project(":BankingUiCommon")
 
 
     testImplementation "org.junit.jupiter:junit-jupiter:$junit5Version"
@@ -20,4 +18,18 @@ dependencies {
     testImplementation "org.assertj:assertj-core:$assertJVersion"
     testImplementation "org.mockito:mockito-core:$mockitoVersion"
 
+}
+
+
+task jarTest (type: Jar) {
+    from sourceSets.test.output
+    classifier = 'test'
+}
+
+configurations {
+    testOutput
+}
+
+artifacts {
+    testOutput jarTest
 }
\ No newline at end of file
diff --git a/tools/BankFinder/src/main/kotlin/net/dankito/banking/bankfinder/InMemoryBankFinder.kt b/tools/BankFinder/src/main/kotlin/net/dankito/banking/bankfinder/InMemoryBankFinder.kt
index c57bcf1f..bc913096 100644
--- a/tools/BankFinder/src/main/kotlin/net/dankito/banking/bankfinder/InMemoryBankFinder.kt
+++ b/tools/BankFinder/src/main/kotlin/net/dankito/banking/bankfinder/InMemoryBankFinder.kt
@@ -3,7 +3,7 @@ package net.dankito.banking.bankfinder
 
 open class InMemoryBankFinder() : BankFinderBase(), IBankFinder {
 
-    internal constructor(bankList: List<BankInfo>) : this() {
+    constructor(bankList: List<BankInfo>) : this() {
         this.bankListField = bankList
     }
 
diff --git a/tools/LuceneBankFinder/build.gradle b/tools/LuceneBankFinder/build.gradle
new file mode 100644
index 00000000..d8860bdb
--- /dev/null
+++ b/tools/LuceneBankFinder/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'java-library'
+apply plugin: 'kotlin'
+
+
+ext.artifactName = "lucene-bank-finder"
+
+sourceCompatibility = "7"
+targetCompatibility = "7"
+
+
+dependencies {
+    api project(":BankFinder")
+
+    implementation "net.dankito.search:lucene-4-utils:$luceneUtilsVersion"
+
+
+    testImplementation project(path: ':BankFinder', configuration: 'testOutput')
+
+    testImplementation "org.junit.jupiter:junit-jupiter:$junit5Version"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit5Version"
+
+    testImplementation "org.assertj:assertj-core:$assertJVersion"
+    testImplementation "org.mockito:mockito-core:$mockitoVersion"
+
+}
\ No newline at end of file
diff --git a/tools/BankFinder/src/main/kotlin/net/dankito/banking/bankfinder/LuceneBankFinder.kt b/tools/LuceneBankFinder/src/main/kotlin/net/dankito/banking/bankfinder/LuceneBankFinder.kt
similarity index 100%
rename from tools/BankFinder/src/main/kotlin/net/dankito/banking/bankfinder/LuceneBankFinder.kt
rename to tools/LuceneBankFinder/src/main/kotlin/net/dankito/banking/bankfinder/LuceneBankFinder.kt
diff --git a/tools/BankFinder/src/test/kotlin/net/dankito/banking/bankfinder/LuceneBankFinderTest.kt b/tools/LuceneBankFinder/src/test/kotlin/net/dankito/banking/bankfinder/LuceneBankFinderTest.kt
similarity index 100%
rename from tools/BankFinder/src/test/kotlin/net/dankito/banking/bankfinder/LuceneBankFinderTest.kt
rename to tools/LuceneBankFinder/src/test/kotlin/net/dankito/banking/bankfinder/LuceneBankFinderTest.kt
diff --git a/ui/BankingAndroidApp/build.gradle b/ui/BankingAndroidApp/build.gradle
index 39a67fce..15f1a1c7 100644
--- a/ui/BankingAndroidApp/build.gradle
+++ b/ui/BankingAndroidApp/build.gradle
@@ -86,7 +86,7 @@ dependencies {
 
     implementation project(':fints4kBankingClient')
 
-    implementation project(':BankFinder')
+    implementation project(':LuceneBankFinder')
 
     implementation project(':BankingPersistenceJson')
     implementation project(':LuceneBankingPersistence')
diff --git a/ui/BankingJavaFxControls/build.gradle b/ui/BankingJavaFxControls/build.gradle
index 3fe6eede..97ebdab5 100644
--- a/ui/BankingJavaFxControls/build.gradle
+++ b/ui/BankingJavaFxControls/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 
     implementation project(":fints4k-jvm")
 
-    api project(":BankFinder")
+    api project(":LuceneBankFinder")
 
     api "net.dankito.utils:java-fx-utils:$javaFxUtilsVersion"
 }
\ No newline at end of file