diff --git a/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall b/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall
index 31bd7c22eea..e1e165be74d 100644
--- a/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall
+++ b/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall
@@ -1,6 +1,7 @@
 let JobSpec = ../../Pipeline/JobSpec.dhall
 let Pipeline = ../../Pipeline/Dsl.dhall
-
+let PipelineMode = ../../Pipeline/Mode.dhall
+let PipelineTag = ../../Pipeline/Tag.dhall
 let Prelude = ../../External/Prelude.dhall
 
 let Cmd = ../../Lib/Cmds.dhall
@@ -25,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 = [
diff --git a/buildkite/src/Jobs/Test/DevelopCompatibility.dhall b/buildkite/src/Jobs/Test/DevelopCompatibility.dhall
index 8a385706e70..b67d4e1a107 100644
--- a/buildkite/src/Jobs/Test/DevelopCompatibility.dhall
+++ b/buildkite/src/Jobs/Test/DevelopCompatibility.dhall
@@ -1,6 +1,7 @@
 let JobSpec = ../../Pipeline/JobSpec.dhall
 let Pipeline = ../../Pipeline/Dsl.dhall
-
+let PipelineMode = ../../Pipeline/Mode.dhall
+let PipelineTag = ../../Pipeline/Tag.dhall
 let Prelude = ../../External/Prelude.dhall
 
 let Cmd = ../../Lib/Cmds.dhall
@@ -25,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 = [