diff --git a/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/PermanentFileStorageTest.kt b/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/PermanentFileStorageTest.kt
index a13b12ab..1deb5fa0 100644
--- a/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/PermanentFileStorageTest.kt
+++ b/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/PermanentFileStorageTest.kt
@@ -3,7 +3,6 @@ package org.moire.ultrasonic.cache
 import java.io.File
 import org.amshove.kluent.`should be equal to`
 import org.amshove.kluent.`should contain`
-import org.amshove.kluent.`should equal`
 import org.junit.Test
 import org.moire.ultrasonic.cache.serializers.getMusicFolderSerializer
 import org.moire.ultrasonic.domain.MusicFolder
@@ -44,7 +43,7 @@ class PermanentFileStorageTest : BaseStorageTest() {
 
         val loadedItem = storage.load(name, getMusicFolderSerializer())
 
-        loadedItem `should equal` item
+        loadedItem `should be equal to` item
     }
 
     @Test
@@ -57,7 +56,7 @@ class PermanentFileStorageTest : BaseStorageTest() {
 
         val loadedItem = storage.load(name, getMusicFolderSerializer())
 
-        loadedItem `should equal` item2
+        loadedItem `should be equal to` item2
     }
 
     @Test
@@ -74,7 +73,7 @@ class PermanentFileStorageTest : BaseStorageTest() {
     fun `Should return null if serialized file not available`() {
         val loadedItem = storage.load("some-name", getMusicFolderSerializer())
 
-        loadedItem `should equal` null
+        loadedItem `should be equal to` null
     }
 
     private fun getServerStorageDir() = File(storageDir, serverId)
diff --git a/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/ArtistSerializerTest.kt b/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/ArtistSerializerTest.kt
index a169a0d8..967bbdb5 100644
--- a/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/ArtistSerializerTest.kt
+++ b/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/ArtistSerializerTest.kt
@@ -1,6 +1,6 @@
 package org.moire.ultrasonic.cache.serializers
 
-import org.amshove.kluent.`should equal`
+import org.amshove.kluent.`should be equal to`
 import org.junit.Test
 import org.moire.ultrasonic.cache.BaseStorageTest
 import org.moire.ultrasonic.domain.Artist
@@ -26,7 +26,7 @@ class ArtistSerializerTest : BaseStorageTest() {
 
         val loadedItem = storage.load(itemName, getArtistsSerializer())
 
-        loadedItem `should equal` item
+        loadedItem `should be equal to` item
     }
 
     @Test
@@ -52,6 +52,6 @@ class ArtistSerializerTest : BaseStorageTest() {
 
         val loadedItems = storage.load(name, getArtistListSerializer())
 
-        loadedItems `should equal` itemsList
+        loadedItems `should be equal to` itemsList
     }
 }
diff --git a/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/IndexesSerializerTest.kt b/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/IndexesSerializerTest.kt
index d7f69bb0..5a4cc1a1 100644
--- a/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/IndexesSerializerTest.kt
+++ b/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/IndexesSerializerTest.kt
@@ -1,6 +1,6 @@
 package org.moire.ultrasonic.cache.serializers
 
-import org.amshove.kluent.`should equal`
+import org.amshove.kluent.`should be equal to`
 import org.junit.Test
 import org.moire.ultrasonic.cache.BaseStorageTest
 import org.moire.ultrasonic.domain.Artist
@@ -33,6 +33,6 @@ class IndexesSerializerTest : BaseStorageTest() {
 
         val loadedItem = storage.load(name, getIndexesSerializer())
 
-        loadedItem `should equal` item
+        loadedItem `should be equal to` item
     }
 }
diff --git a/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/MusicFolderSerializerTest.kt b/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/MusicFolderSerializerTest.kt
index 11e63ab9..1935dac8 100644
--- a/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/MusicFolderSerializerTest.kt
+++ b/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/MusicFolderSerializerTest.kt
@@ -1,6 +1,6 @@
 package org.moire.ultrasonic.cache.serializers
 
-import org.amshove.kluent.`should equal`
+import org.amshove.kluent.`should be equal to`
 import org.junit.Test
 import org.moire.ultrasonic.cache.BaseStorageTest
 import org.moire.ultrasonic.domain.MusicFolder
@@ -26,7 +26,7 @@ class MusicFolderSerializerTest : BaseStorageTest() {
 
         val loadedItem = storage.load(name, getMusicFolderSerializer())
 
-        loadedItem `should equal` item
+        loadedItem `should be equal to` item
     }
 
     @Test
@@ -52,6 +52,6 @@ class MusicFolderSerializerTest : BaseStorageTest() {
 
         val loadedItem = storage.load(name, getMusicFolderListSerializer())
 
-        loadedItem `should equal` itemsList
+        loadedItem `should be equal to` itemsList
     }
 }
diff --git a/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetAvatarTest.kt b/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetAvatarTest.kt
index c180f0a9..3bb637ac 100644
--- a/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetAvatarTest.kt
+++ b/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetAvatarTest.kt
@@ -3,7 +3,6 @@ package org.moire.ultrasonic.api.subsonic
 import okhttp3.mockwebserver.MockResponse
 import org.amshove.kluent.`should be equal to`
 import org.amshove.kluent.`should be`
-import org.amshove.kluent.`should equal`
 import org.amshove.kluent.`should not be`
 import org.junit.Test
 
@@ -20,7 +19,7 @@ class SubsonicApiGetAvatarTest : SubsonicAPIClientTest() {
         with(response) {
             stream `should be` null
             responseHttpCode `should be equal to` 200
-            apiError `should equal` SubsonicError.RequestedDataWasNotFound
+            apiError `should be equal to` SubsonicError.RequestedDataWasNotFound
         }
     }
 
@@ -32,7 +31,7 @@ class SubsonicApiGetAvatarTest : SubsonicAPIClientTest() {
         val response = client.getAvatar("some")
 
         with(response) {
-            stream `should equal` null
+            stream `should be equal to` null
             responseHttpCode `should be equal to` httpErrorCode
             apiError `should be` null
         }
diff --git a/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPlaylistsTest.kt b/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPlaylistsTest.kt
index f1c828cf..409cf933 100644
--- a/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPlaylistsTest.kt
+++ b/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPlaylistsTest.kt
@@ -1,7 +1,6 @@
 package org.moire.ultrasonic.api.subsonic
 
 import org.amshove.kluent.`should be equal to`
-import org.amshove.kluent.`should equal`
 import org.amshove.kluent.`should not be`
 import org.junit.Test
 import org.moire.ultrasonic.api.subsonic.models.Playlist
@@ -17,7 +16,7 @@ class SubsonicApiGetPlaylistsTest : SubsonicAPIClientTest() {
         }
 
         response.playlists `should not be` null
-        response.playlists `should equal` emptyList()
+        response.playlists `should be equal to` emptyList()
     }
 
     @Test
@@ -29,7 +28,7 @@ class SubsonicApiGetPlaylistsTest : SubsonicAPIClientTest() {
         assertResponseSuccessful(response)
         with(response.body()!!.playlists) {
             size `should be equal to` 1
-            this[0] `should equal` Playlist(
+            this[0] `should be equal to` Playlist(
                 id = "0", name = "Aug 27, 2017 11:17 AM",
                 owner = "admin", public = false, songCount = 16, duration = 3573,
                 comment = "Some comment",