diff --git a/src/lib/Hydra/Event.pm b/src/lib/Hydra/Event.pm
index 9efeda67..86cf9055 100644
--- a/src/lib/Hydra/Event.pm
+++ b/src/lib/Hydra/Event.pm
@@ -2,20 +2,20 @@ package Hydra::Event;
 
 use strict;
 use warnings;
-use Hydra::Event::CachedBuildFinished;
-use Hydra::Event::CachedBuildQueued;
 use Hydra::Event::BuildFinished;
 use Hydra::Event::BuildQueued;
 use Hydra::Event::BuildStarted;
+use Hydra::Event::CachedBuildFinished;
+use Hydra::Event::CachedBuildQueued;
 use Hydra::Event::StepFinished;
 
 my %channels_to_events = (
+  build_finished => \&Hydra::Event::BuildFinished::parse,
   build_queued => \&Hydra::Event::BuildQueued::parse,
   build_started => \&Hydra::Event::BuildStarted::parse,
-  step_finished => \&Hydra::Event::StepFinished::parse,
-  build_finished => \&Hydra::Event::BuildFinished::parse,
   cached_build_finished => \&Hydra::Event::CachedBuildFinished::parse,
   cached_build_queued => \&Hydra::Event::CachedBuildQueued::parse,
+  step_finished => \&Hydra::Event::StepFinished::parse,
 );
 
 
diff --git a/t/scripts/hydra-eval-jobset/notifications.t b/t/scripts/hydra-eval-jobset/notifications.t
index d0bbb3af..8fe5d0f4 100644
--- a/t/scripts/hydra-eval-jobset/notifications.t
+++ b/t/scripts/hydra-eval-jobset/notifications.t
@@ -17,14 +17,14 @@ path_input_cache_validity_seconds = 0
 my $dbh = $ctx->db()->storage->dbh;
 my $listener = Hydra::PostgresListener->new($dbh);
 
+$listener->subscribe("build_queued");
+$listener->subscribe("builds_added");
 $listener->subscribe("cached_build_finished");
 $listener->subscribe("cached_build_queued");
-$listener->subscribe("build_queued");
-$listener->subscribe("eval_failed");
-$listener->subscribe("eval_cached");
 $listener->subscribe("eval_added");
+$listener->subscribe("eval_cached");
+$listener->subscribe("eval_failed");
 $listener->subscribe("eval_started");
-$listener->subscribe("builds_added");
 
 
 my $jobsetdir = $ctx->tmpdir . '/jobset';