diff --git a/recipe_modules/pipeline/tests/full.expected/empty.json b/recipe_modules/pipeline/tests/full.expected/empty.json
deleted file mode 100644
index 7d97243..0000000
--- a/recipe_modules/pipeline/tests/full.expected/empty.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "not in pipeline"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipe_modules/pipeline/tests/full.expected/round_0.json b/recipe_modules/pipeline/tests/full.expected/round_0.json
deleted file mode 100644
index cc68ad8..0000000
--- a/recipe_modules/pipeline/tests/full.expected/round_0.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "in pipeline"
-  },
-  {
-    "cmd": [],
-    "name": "round 0"
-  },
-  {
-    "cmd": [],
-    "name": "0 previous builds"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipe_modules/pipeline/tests/full.expected/round_1.json b/recipe_modules/pipeline/tests/full.expected/round_1.json
deleted file mode 100644
index b0e3d4e..0000000
--- a/recipe_modules/pipeline/tests/full.expected/round_1.json
+++ /dev/null
@@ -1,21 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "in pipeline"
-  },
-  {
-    "cmd": [],
-    "name": "round 1"
-  },
-  {
-    "cmd": [],
-    "name": "1 previous builds"
-  },
-  {
-    "cmd": [],
-    "name": "previous build 123"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipe_modules/pipeline/tests/full.expected/round_4.json b/recipe_modules/pipeline/tests/full.expected/round_4.json
deleted file mode 100644
index 90cad80..0000000
--- a/recipe_modules/pipeline/tests/full.expected/round_4.json
+++ /dev/null
@@ -1,29 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "in pipeline"
-  },
-  {
-    "cmd": [],
-    "name": "round 4"
-  },
-  {
-    "cmd": [],
-    "name": "3 previous builds"
-  },
-  {
-    "cmd": [],
-    "name": "previous build 123"
-  },
-  {
-    "cmd": [],
-    "name": "previous build 456"
-  },
-  {
-    "cmd": [],
-    "name": "previous build 789"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipe_modules/pipeline/tests/full.py b/recipe_modules/pipeline/tests/full.py
index ec7948d..4817c4b 100644
--- a/recipe_modules/pipeline/tests/full.py
+++ b/recipe_modules/pipeline/tests/full.py
@@ -40,6 +40,9 @@
     def ran(x):
         return api.post_process(post_process.MustRun, x)
 
+    def drop():
+        return api.post_process(post_process.DropExpectation)
+
     yield api.test('nopipeline') + ran('not in pipeline')
 
     yield (
@@ -48,6 +51,7 @@
         + ran('in pipeline')
         + ran('round 0')
         + ran('0 previous builds')
+        + drop()
     )
 
     yield (
@@ -57,6 +61,7 @@
         + ran('round 1')
         + ran('1 previous builds')
         + ran('previous build 123')
+        + drop()
     )
 
     yield (
@@ -68,6 +73,7 @@
         + ran('previous build 123')
         + ran('previous build 456')
         + ran('previous build 789')
+        + drop()
     )
 
-    yield api.test('empty')
+    yield api.test('empty') + ran('not in pipeline') + drop()