diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt
index 589fcad5a2..76cd44635b 100644
--- a/Userland/Utilities/CMakeLists.txt
+++ b/Userland/Utilities/CMakeLists.txt
@@ -146,7 +146,7 @@ target_link_libraries(tar LibArchive LibCompress)
 target_link_libraries(telws LibProtocol LibLine)
 target_link_libraries(test-crypto LibCrypto LibTLS LibLine)
 target_link_libraries(test-fuzz LibCore LibGemini LibGfx LibHTTP LibIPC LibJS LibMarkdown LibShell)
-target_link_libraries(test-imap LibIMAP)
+target_link_libraries(test-imap LibIMAP LibMain)
 target_link_libraries(test-pthread LibThreading)
 target_link_libraries(top LibMain)
 target_link_libraries(touch LibMain)
diff --git a/Userland/Utilities/test-imap.cpp b/Userland/Utilities/test-imap.cpp
index c3cb3c0e3d..d056595478 100644
--- a/Userland/Utilities/test-imap.cpp
+++ b/Userland/Utilities/test-imap.cpp
@@ -9,8 +9,9 @@
 #include <LibCore/File.h>
 #include <LibCore/GetPassword.h>
 #include <LibIMAP/Client.h>
+#include <LibMain/Main.h>
 
-int main(int argc, char** argv)
+ErrorOr<int> serenity_main(Main::Arguments arguments)
 {
     if (pledge("stdio inet tty rpath unix", nullptr) < 0) {
         perror("pledge");
@@ -32,15 +33,10 @@ int main(int argc, char** argv)
     args_parser.add_positional_argument(host, "IMAP host", "host");
     args_parser.add_positional_argument(port, "Port to connect to", "port");
     args_parser.add_positional_argument(username, "Username", "username");
-    args_parser.parse(argc, argv);
+    args_parser.parse(arguments);
 
     if (interactive_password) {
-        auto password_or_error = Core::get_password();
-        if (password_or_error.is_error()) {
-            warnln("{}", password_or_error.error());
-            return 1;
-        }
-        password = password_or_error.release_value();
+        password = TRY(Core::get_password());
     } else {
         auto standard_input = Core::File::standard_input();
         password = Core::SecretString::take_ownership(standard_input->read_all());