diff --git a/libraries/androidutils/build.gradle.kts b/libraries/androidutils/build.gradle.kts
index 87382a2c3e..94e6d92160 100644
--- a/libraries/androidutils/build.gradle.kts
+++ b/libraries/androidutils/build.gradle.kts
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2023 New Vector Ltd
  *
@@ -33,6 +32,7 @@ dependencies {
     implementation(projects.libraries.di)
 
     implementation(projects.libraries.core)
+    implementation(projects.services.toolbox.api)
     implementation(libs.dagger)
     implementation(libs.timber)
     implementation(libs.androidx.corektx)
@@ -41,4 +41,12 @@ dependencies {
     implementation(libs.androidx.exifinterface)
     implementation(libs.androidx.security.crypto)
     api(libs.androidx.browser)
+
+    testImplementation(projects.tests.testutils)
+    testImplementation(libs.test.junit)
+    testImplementation(libs.test.truth)
+    testImplementation(libs.test.robolectric)
+    testImplementation(libs.coroutines.core)
+    testImplementation(libs.coroutines.test)
+    testImplementation(projects.services.toolbox.test)
 }
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatter.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatter.kt
index 9cd70febcc..abf55b581c 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatter.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatter.kt
@@ -22,16 +22,18 @@ import android.text.format.Formatter
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.ApplicationContext
+import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider
 import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
 class AndroidFileSizeFormatter @Inject constructor(
     @ApplicationContext private val context: Context,
-    ) : FileSizeFormatter {
+    private val sdkIntProvider: BuildVersionSdkIntProvider,
+) : FileSizeFormatter {
     override fun format(fileSize: Long, useShortFormat: Boolean): String {
         // Since Android O, the system considers that 1kB = 1000 bytes instead of 1024 bytes.
         // We want to avoid that.
-        val normalizedSize = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N) {
+        val normalizedSize = if (sdkIntProvider.get() <= Build.VERSION_CODES.N) {
             fileSize
         } else {
             // First convert the size
diff --git a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatterTest.kt b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatterTest.kt
new file mode 100644
index 0000000000..4d83a2367a
--- /dev/null
+++ b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatterTest.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package  io.element.android.libraries.androidutils.filesize
+
+import android.os.Build
+import com.google.common.truth.Truth.assertThat
+import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+
+@RunWith(RobolectricTestRunner::class)
+class AndroidFileSizeFormatterTest {
+    @Test
+    fun `test api 24 long format`() {
+        val sut = createAndroidFileSizeFormatter(sdkLevel = Build.VERSION_CODES.N)
+        assertThat(sut.format(1, useShortFormat = false)).isEqualTo("1.00B")
+        assertThat(sut.format(1000, useShortFormat = false)).isEqualTo("0.98KB")
+        assertThat(sut.format(1024, useShortFormat = false)).isEqualTo("1.00KB")
+        assertThat(sut.format(1024 * 1024, useShortFormat = false)).isEqualTo("1.00MB")
+        assertThat(sut.format(1024 * 1024 * 1024, useShortFormat = false)).isEqualTo("1.00GB")
+    }
+
+    @Test
+    fun `test api 26 long format`() {
+        val sut = createAndroidFileSizeFormatter(sdkLevel = Build.VERSION_CODES.O)
+        assertThat(sut.format(1, useShortFormat = false)).isEqualTo("1.00B")
+        assertThat(sut.format(1000, useShortFormat = false)).isEqualTo("0.98KB")
+        assertThat(sut.format(1024 * 1024, useShortFormat = false)).isEqualTo("0.95MB")
+        assertThat(sut.format(1024 * 1024 * 1024, useShortFormat = false)).isEqualTo("0.93GB")
+    }
+
+    @Test
+    fun `test api 24 short format`() {
+        val sut = createAndroidFileSizeFormatter(sdkLevel = Build.VERSION_CODES.N)
+        assertThat(sut.format(1, useShortFormat = true)).isEqualTo("1.0B")
+        assertThat(sut.format(1000, useShortFormat = true)).isEqualTo("0.98KB")
+        assertThat(sut.format(1024, useShortFormat = true)).isEqualTo("1.0KB")
+        assertThat(sut.format(1024 * 1024, useShortFormat = true)).isEqualTo("1.0MB")
+        assertThat(sut.format(1024 * 1024 * 1024, useShortFormat = true)).isEqualTo("1.0GB")
+    }
+
+    @Test
+    fun `test api 26 short format`() {
+        val sut = createAndroidFileSizeFormatter(sdkLevel = Build.VERSION_CODES.O)
+        assertThat(sut.format(1, useShortFormat = true)).isEqualTo("1.0B")
+        assertThat(sut.format(1000, useShortFormat = true)).isEqualTo("0.98KB")
+        assertThat(sut.format(1024 * 1024, useShortFormat = true)).isEqualTo("0.95MB")
+        assertThat(sut.format(1024 * 1024 * 1024, useShortFormat = true)).isEqualTo("0.93GB")
+    }
+
+    private fun createAndroidFileSizeFormatter(sdkLevel: Int) = AndroidFileSizeFormatter(
+        context = RuntimeEnvironment.getApplication(),
+        sdkIntProvider = FakeBuildVersionSdkIntProvider(sdkInt = sdkLevel)
+    )
+}