diff --git a/explorer/lit_testdata/trace.carbon b/explorer/lit_testdata/trace.carbon
index d348dc996eec..5cacba4a0f96 100644
--- a/explorer/lit_testdata/trace.carbon
+++ b/explorer/lit_testdata/trace.carbon
@@ -16,6 +16,7 @@
 // RUN: %{explorer} --parser_debug --trace_file=- -trace_phase=declarations | %{FileCheck-allow-unmatched} --check-prefixes=NO-SOURCE,NO-NAMES,NO-PRELUDE,NO-FLOW,NO-TYPE,NO-UNFORMED,DECLS,NO-EXEC,NO-TIMING
 // RUN: %{explorer} --parser_debug --trace_file=- -trace_phase=timing | %{FileCheck-allow-unmatched} --check-prefixes=NO-SOURCE,NO-NAMES,NO-PRELUDE,NO-FLOW,NO-TYPE,NO-UNFORMED,NO-DECLS,NO-EXEC,TIMING
 // RUN: %{explorer} --parser_debug --trace_file=- -trace_phase=all | %{FileCheck-allow-unmatched} --check-prefixes=SOURCE,NAMES,NO-PRELUDE,FLOW,TYPE,UNFORMED,DECLS,EXEC,TIMING
+// RUN: %{explorer} --parser_debug --trace_file=- -trace_phase=source_program,declarations | %{FileCheck-allow-unmatched} --check-prefixes=SOURCE,NO-NAMES,NO-PRELUDE,NO-FLOW,NO-TYPE,NO-UNFORMED,DECLS,NO-EXEC,NO-TIMING
 // NO-SOURCE-NOT:STDOUT: ********** source program **********
 //        SOURCE:STDOUT: ********** source program **********
 // NO-SOURCE-NOT:STDOUT: interface TestInterface {
diff --git a/explorer/main.cpp b/explorer/main.cpp
index 9d175a4d2f5a..53c56d0345ce 100644
--- a/explorer/main.cpp
+++ b/explorer/main.cpp
@@ -78,7 +78,8 @@ auto ExplorerMain(int argc, char** argv, void* static_for_main_addr,
               ProgramPhase::Timing, "timing",
               "Include timing logs for each phase, indicating the time taken."),
           clEnumValN(ProgramPhase::All, "all",
-                     "Include trace output for all phases.")));
+                     "Include trace output for all phases.")),
+      cl::CommaSeparated);
 
   // Use the executable path as a base for the relative prelude path.
   std::string exe =