diff --git a/noaa/challenges/default.json b/noaa/challenges/default.json
index 4aabde62..6bf9f76c 100644
--- a/noaa/challenges/default.json
+++ b/noaa/challenges/default.json
@@ -337,4 +337,72 @@
           "target-throughput": 1
         }
       ]
+    },
+    {
+      "name": "terms",
+      "description": "Checks the performance of terms aggregations",
+      "default": false,
+      "schedule": [
+        {
+          "operation": "delete-index"
+        },
+        {
+          "operation": {
+            "operation-type": "create-index",
+            "settings": {{index_settings | default({}) | tojson}}
+          }
+        },
+        {
+          "name": "check-cluster-health",
+          "operation": {
+            "operation-type": "cluster-health",
+            "index": "weather-data-2016",
+            "request-params": {
+              "wait_for_status": "{{cluster_health | default('green')}}",
+              "wait_for_no_relocating_shards": "true"
+            }
+          }
+        },
+        {
+          "operation": "index",
+          "#COMMENT": "This is an incredibly short warmup time period but it is necessary to get also measurement samples. As this benchmark is rather about search than indexing this is ok.",
+          "warmup-time-period": 10,
+          "clients": {{bulk_indexing_clients | default(8)}}
+        },
+        {
+          "name": "refresh-after-index",
+          "operation": "refresh",
+          "clients": 1
+        },
+        {
+          "operation": "force-merge",
+          "clients": 1
+        },
+        {
+          "name": "refresh-after-force-merge",
+          "operation": "refresh",
+          "clients": 1
+        },
+        {
+          "operation": "keyword_terms_numeric_terms",
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50,
+          "target-interval": 4
+        },
+        {
+          "operation": "numeric_terms_numeric_terms",
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50,
+          "target-interval": 3
+        },
+        {
+          "operation": "date_histo_numeric_terms",
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50,
+          "target-interval": 5
+        }
+      ]
     }
diff --git a/noaa/operations/default.json b/noaa/operations/default.json
index 4615d4d3..4dfcfbf7 100644
--- a/noaa/operations/default.json
+++ b/noaa/operations/default.json
@@ -713,5 +713,76 @@
           }
         }
       }
+    },
+    {
+      "name": "keyword_terms_numeric_terms",
+      "operation-type": "search",
+      "body": {
+        "size": 0,
+        "aggs": {
+          "station": {
+            "terms": {
+              "field": "station.id",
+              "size": 500
+            },
+            "aggs": {
+              "date": {
+                "terms": {
+                  "field": "date",
+                  "size": 1
+                },
+                "aggs": {
+                  "max": {
+                    "max": { "field": "tmax" }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    {
+      "name": "numeric_terms_numeric_terms",
+      "operation-type": "search",
+      "body": {
+        "size": 0,
+        "aggs": {
+          "tmax": {
+            "terms": {
+              "field": "TMAX",
+              "size": 100
+            },
+            "aggs": {
+              "tavg": {
+                "terms": {
+                  "field": "TAVG"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    {
+      "name": "date_histo_numeric_terms",
+      "operation-type": "search",
+      "body": {
+        "size": 0,
+        "aggs": {
+          "date": {
+            "date_histogram": {
+              "field": "date",
+              "calendar_interval": "1w"
+            },
+            "aggs": {
+              "tavg": {
+                "terms": {
+                  "field": "TAVG"
+                }
+              }
+            }
+          }
+        }
+      }
     }
-    
\ No newline at end of file