diff --git a/app/src/androidTest/java/com/nextcloud/utils/UploadDateTests.kt b/app/src/androidTest/java/com/nextcloud/utils/UploadDateTests.kt
new file mode 100644
index 000000000000..00177f0f872c
--- /dev/null
+++ b/app/src/androidTest/java/com/nextcloud/utils/UploadDateTests.kt
@@ -0,0 +1,155 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.utils
+
+import android.content.Context
+import android.text.format.DateUtils
+import androidx.test.platform.app.InstrumentationRegistry
+import com.nextcloud.client.database.entity.UploadEntity
+import com.nextcloud.client.database.entity.toOCUpload
+import com.nextcloud.client.database.entity.toUploadEntity
+import com.owncloud.android.R
+import com.owncloud.android.utils.DisplayUtils
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.mockkStatic
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+class UploadDateTests {
+
+    companion object {
+        private const val JANUARY_27_2026 = 1769505718000
+        private const val ONE_YEAR = 365L * 24 * 60 * 60 * 1000
+        private const val ONE_MONTH = 30L * 24 * 60 * 60 * 1000
+        private const val ONE_WEEK = 7 * 24 * 60 * 60 * 1000
+        private const val TWO_HOURS = 2 * 60 * 60 * 1000
+        private const val ONE_MINUTE = 60_000
+        private const val THIRTY_SECONDS = 30_000
+
+        private const val DATE_FORMATTER_PATTERN = "MMM dd, yyyy, hh:mm:ss a"
+    }
+
+    private lateinit var context: Context
+
+    @Before
+    fun setup() {
+        context = InstrumentationRegistry.getInstrumentation().context
+        MockKAnnotations.init(this, relaxed = true)
+        mockkStatic(System::class)
+        every { System.currentTimeMillis() } returns JANUARY_27_2026
+    }
+
+    @Test
+    fun uploadEntityConvertsToOCUploadAndBackCorrectly() {
+        val entity = UploadEntity(
+            id = 123,
+            localPath = "/local/file.txt",
+            remotePath = "/remote/file.txt",
+            accountName = "test@example.com",
+            fileSize = 1024L,
+            status = 2,
+            localBehaviour = 1,
+            uploadTime = null,
+            nameCollisionPolicy = 0,
+            isCreateRemoteFolder = 1,
+            uploadEndTimestamp = 0,
+            uploadEndTimestampLong = 1_650_000_000_000,
+            lastResult = 0,
+            isWhileChargingOnly = 1,
+            isWifiOnly = 1,
+            createdBy = 5,
+            folderUnlockToken = "token123"
+        )
+
+        val upload = entity.toOCUpload()
+        assertNotNull(upload)
+        assertEquals(entity.localPath, upload?.localPath)
+        assertEquals(entity.remotePath, upload?.remotePath)
+        assertEquals(entity.uploadEndTimestampLong, upload?.uploadEndTimestamp)
+
+        val convertedEntity = upload!!.toUploadEntity()
+        assertEquals(entity.localPath, convertedEntity.localPath)
+        assertEquals(entity.remotePath, convertedEntity.remotePath)
+        assertEquals(entity.uploadEndTimestampLong, convertedEntity.uploadEndTimestampLong)
+        assertEquals(entity.isCreateRemoteFolder, convertedEntity.isCreateRemoteFolder)
+        assertEquals(entity.isWifiOnly, convertedEntity.isWifiOnly)
+        assertEquals(entity.isWhileChargingOnly, convertedEntity.isWhileChargingOnly)
+    }
+
+    @Test
+    fun getRelativeDateTimeStringReturnsSecondsAgoForRecentPast() {
+        val result = DisplayUtils.getRelativeDateTimeString(
+            context,
+            JANUARY_27_2026 - THIRTY_SECONDS,
+            DateUtils.SECOND_IN_MILLIS,
+            DateUtils.WEEK_IN_MILLIS,
+            0
+        )
+        assertTrue(result.toString() == context.getString(R.string.file_list_seconds_ago))
+    }
+
+    @Test
+    fun getRelativeDateTimeStringReturnsFutureAsHumanReadableWhenShowFutureIsFalse() {
+        val formatter = SimpleDateFormat(DATE_FORMATTER_PATTERN, Locale.US)
+        val time = JANUARY_27_2026 + ONE_MINUTE
+        val expected = formatter.format(Date(time))
+
+        assertRelativeDateTimeString(time, expected, DateUtils.SECOND_IN_MILLIS)
+    }
+
+    @Test
+    fun getRelativeDateTimeStringReturnsProperRelativeStringForHoursAgo() {
+        val expected = "2 hours ago"
+        val time = JANUARY_27_2026 - TWO_HOURS
+
+        assertRelativeDateTimeString(time, expected, DateUtils.MINUTE_IN_MILLIS)
+    }
+
+    @Test
+    fun getRelativeDateTimeStringReturnsRelativeStringForOneWeekAgo() {
+        val expected = "Jan 20"
+        val time = JANUARY_27_2026 - ONE_WEEK
+
+        assertRelativeDateTimeString(time, expected)
+    }
+
+    @Test
+    fun getRelativeDateTimeStringReturnsRelativeStringForOneMonthAgo() {
+        val expected = "12/28/2025"
+        val time = JANUARY_27_2026 - ONE_MONTH
+
+        assertRelativeDateTimeString(time, expected, DateUtils.DAY_IN_MILLIS)
+    }
+
+    @Test
+    fun getRelativeDateTimeStringReturnsRelativeStringForOneYearAgo() {
+        val expected = "1/27/2025"
+        val time = JANUARY_27_2026 - ONE_YEAR
+
+        assertRelativeDateTimeString(time, expected, DateUtils.DAY_IN_MILLIS)
+    }
+
+    private fun assertRelativeDateTimeString(
+        time: Long,
+        expected: String,
+        minResolution: Long = DateUtils.MINUTE_IN_MILLIS,
+        transitionResolution: Long = DateUtils.WEEK_IN_MILLIS
+    ) {
+        val result = DisplayUtils.getRelativeDateTimeString(context, time, minResolution, transitionResolution, 0)
+        assertEquals(expected.normalizeResult(), result.toString().normalizeResult())
+    }
+
+    private fun String.normalizeResult(): String = replace('\u202F', ' ').replace('\u00A0', ' ')
+}