diff --git a/tests/applications/gnome-text-editor/aaa_setup.pm b/tests/applications/gnome-text-editor/aaa_setup.pm
index c410e632..f1c78d50 100644
--- a/tests/applications/gnome-text-editor/aaa_setup.pm
+++ b/tests/applications/gnome-text-editor/aaa_setup.pm
@@ -14,6 +14,8 @@ sub run {
     # Get the test data from the test data repository.
     check_and_install_git();
     download_testdata("gnome-text-editor", "Documents");
+    # Remove gedit on upgraded systems so we don't launch it by accident
+    script_run("dnf -y remove gedit") if (get_var("IMAGETYPE") eq "upgrade");
     # Return to Desktop
     desktop_vt();