diff --git a/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall b/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall
index ff82505797b..e1e165be74d 100644
--- a/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall
+++ b/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall
@@ -26,6 +26,7 @@ in Pipeline.build Pipeline.Config::{
       S.exactly "buildkite/src/Jobs/Test/BerkeleyCompatibility" "dhall"
     ],
     path = "Test",
+    tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ],
     name = "BerkeleyCompatibility"
   },
   steps = [
@@ -37,7 +38,6 @@ in Pipeline.build Pipeline.Config::{
       key = "berkeley-compatibilty-test",
       target = Size.XLarge,
       docker = None Docker.Type,
-      tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ],
       depends_on = dependsOn
     }
   ]
diff --git a/buildkite/src/Jobs/Test/DevelopCompatibility.dhall b/buildkite/src/Jobs/Test/DevelopCompatibility.dhall
index 1fe1025b202..b67d4e1a107 100644
--- a/buildkite/src/Jobs/Test/DevelopCompatibility.dhall
+++ b/buildkite/src/Jobs/Test/DevelopCompatibility.dhall
@@ -26,6 +26,7 @@ in Pipeline.build Pipeline.Config::{
       S.exactly "buildkite/src/Jobs/Test/DevelopCompatibility" "dhall"
     ],
     path = "Test",
+    tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ],
     name = "DevelopCompatibility"
   },
   steps = [
@@ -37,7 +38,6 @@ in Pipeline.build Pipeline.Config::{
       key = "develop-compatibilty-test",
       target = Size.XLarge,
       docker = None Docker.Type,
-      tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ],
       depends_on = dependsOn
     }
   ]