diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7fe90c8..20d9ad7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -24,6 +24,8 @@ jobs:
       uses: reactivecircus/android-emulator-runner@v2.30.1
       with:
         api-level: 29
+        arch: x86
+        target: google_apis_playstore
         script: tools/ci-build.sh
       env:
         KEYSTORE: ${{ secrets.KEYSTORE }}
diff --git a/app/src/androidTest/java/hu/vmiklos/plees_tracker/MainActivityInstrumentedTest.kt b/app/src/androidTest/java/hu/vmiklos/plees_tracker/MainActivityInstrumentedTest.kt
deleted file mode 100644
index 1a9679e..0000000
--- a/app/src/androidTest/java/hu/vmiklos/plees_tracker/MainActivityInstrumentedTest.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2023 Miklos Vajna
- *
- * SPDX-License-Identifier: MIT
- */
-
-package hu.vmiklos.plees_tracker
-
-import android.app.Activity
-import android.app.Instrumentation.ActivityResult
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.intent.Intents
-import androidx.test.espresso.intent.Intents.intending
-import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.rules.ActivityScenarioRule
-import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
-import java.io.File
-import java.time.Duration
-import java.util.Calendar
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Rule
-import org.junit.rules.TemporaryFolder
-
-/**
- * Instrumented tests for MainActivity.
- */
-// @RunWith(AndroidJUnit4::class)
-class MainActivityInstrumentedTest {
-
-    @JvmField
-    @Rule
-    var activityScenarioRule = ActivityScenarioRule(MainActivity::class.java)
-
-    @get:Rule
-    var tempFolder = TemporaryFolder()
-
-    private lateinit var exportFile: File
-    private lateinit var database: AppDatabase
-    private lateinit var context: Context
-
-    @Before
-    fun setup() {
-        exportFile = tempFolder.newFile("sleeps.csv")
-        context = ApplicationProvider.getApplicationContext()
-        database = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java).build()
-        DataModel.database = database
-        Intents.init()
-    }
-
-    @After
-    fun cleanup() {
-        database.close()
-        Intents.release()
-    }
-
-    // FIXME started to fail with: java.lang.AssertionError: expected:<1> but was:<0>
-    // @Test
-    fun testImportExport() = runBlocking {
-        // Create one sleep.
-        val sleep = Sleep()
-        sleep.start = Calendar.getInstance().timeInMillis - Duration.ofHours(1).toMillis()
-        sleep.stop = Calendar.getInstance().timeInMillis
-        database.sleepDao().insert(sleep)
-        assertEquals(1, database.sleepDao().getAll().size)
-
-        // Export.
-        exportToFile()
-
-        // Clear the database.
-        database.clearAllTables()
-        assertEquals(0, database.sleepDao().getAll().size)
-
-        // Import.
-        importFromFile()
-        assertEquals(1, database.sleepDao().getAll().size)
-    }
-
-    private fun exportToFile() {
-        val intent = Intent()
-        intent.data = Uri.fromFile(exportFile)
-        val result = ActivityResult(Activity.RESULT_OK, intent)
-        intending(hasAction(Intent.ACTION_CREATE_DOCUMENT)).respondWith(result)
-        openActionBarOverflowOrOptionsMenu(getInstrumentation().targetContext)
-        onView(withText(context.getString(R.string.export_file_item))).perform(click())
-    }
-
-    private fun importFromFile() {
-        val intent = Intent()
-        intent.data = Uri.fromFile(exportFile)
-        val result = ActivityResult(Activity.RESULT_OK, intent)
-        intending(hasAction(Intent.ACTION_GET_CONTENT)).respondWith(result)
-        openActionBarOverflowOrOptionsMenu(getInstrumentation().targetContext)
-        onView(withText(context.getString(R.string.import_file_item))).perform(click())
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/app/src/androidTest/java/hu/vmiklos/plees_tracker/MainActivityUITest.kt b/app/src/androidTest/java/hu/vmiklos/plees_tracker/MainActivityUITest.kt
index 614e2c3..4081b52 100644
--- a/app/src/androidTest/java/hu/vmiklos/plees_tracker/MainActivityUITest.kt
+++ b/app/src/androidTest/java/hu/vmiklos/plees_tracker/MainActivityUITest.kt
@@ -63,6 +63,16 @@ class MainActivityUITest {
         return device.wait(Until.findObject(By.res(pkg, resourceId)), timeout)
     }
 
+    private fun findObjectByText(text: String): UiObject2 {
+        val device = getDevice()
+        return device.wait(Until.findObject(By.text(text)), timeout)
+    }
+
+    private fun findObjectByDesc(desc: String): UiObject2 {
+        val device = getDevice()
+        return device.wait(Until.findObject(By.desc(desc)), timeout)
+    }
+
     @Test
     fun testCreateAndRead() {
         // Given no sleeps:
@@ -88,6 +98,27 @@ class MainActivityUITest {
         // Then make sure we have no sleeps:
         assertResText("fragment_stats_sleeps", "0")
     }
+
+    @Test
+    fun testUpdate() {
+        resetDatabase()
+        createSleep()
+
+        findObjectByRes("sleep_swipeable").click()
+        findObjectByRes("sleep_start_time").click()
+        findObjectByText("AM").click()
+        findObjectByDesc("10").click()
+        findObjectByDesc("0").click()
+        findObjectByText("OK").click()
+        findObjectByRes("sleep_stop_time").click()
+        findObjectByText("PM").click()
+        findObjectByDesc("10").click()
+        findObjectByDesc("0").click()
+        findObjectByText("OK").click()
+
+        assertResText("sleep_start_time", "10:00")
+        assertResText("sleep_stop_time", "22:00")
+    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */