diff --git a/x-pack/test/api_integration/apis/infraops/index.js b/x-pack/test/api_integration/apis/infraops/index.js
index 8a4b19e7dd3b56c..1854ecab4e1f066 100644
--- a/x-pack/test/api_integration/apis/infraops/index.js
+++ b/x-pack/test/api_integration/apis/infraops/index.js
@@ -7,5 +7,6 @@
 export default function ({ loadTestFile }) {
   describe('InfraOps GraphQL Endpoints', () => {
     loadTestFile(require.resolve('./metrics'));
+    loadTestFile(require.resolve('./waffle'));
   });
 }
diff --git a/x-pack/test/api_integration/apis/infraops/waffle.js b/x-pack/test/api_integration/apis/infraops/waffle.js
new file mode 100644
index 000000000000000..00d8202488e79d4
--- /dev/null
+++ b/x-pack/test/api_integration/apis/infraops/waffle.js
@@ -0,0 +1,106 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from 'expect.js';
+import { get, first, last } from 'lodash';
+import { waffleNodesQuery } from '../../../../plugins/infra/public/containers/waffle/waffle_nodes.gql_query';
+
+export default function ({ getService }) {
+  const esArchiver = getService('esArchiver');
+  const client = getService('infraOpsGraphQLClient');
+
+  describe('waffle nodes', () => {
+    before(() => esArchiver.load('infraops'));
+    after(() => esArchiver.unload('infraops'));
+
+    it('should basically work', () => {
+      return client.query({
+        query: waffleNodesQuery,
+        variables: {
+          sourceId: 'default',
+          timerange: {
+            to: 1539806283952,
+            from: 1539805341208,
+            interval: '1m'
+          },
+          metric: { type: 'cpu' },
+          path: [{ type: 'hosts' }]
+        }
+      }).then(resp => {
+        const nodes = get(resp, 'data.source.map.nodes');
+        expect(nodes.length).to.equal(6);
+        const firstNode = first(nodes);
+        expect(firstNode).to.have.property('path');
+        expect(firstNode.path.length).to.equal(1);
+        expect(first(firstNode.path)).to.have.property('value', 'demo-stack-apache-01');
+        expect(firstNode).to.have.property('metric');
+        expect(firstNode.metric).to.eql({
+          name: 'cpu',
+          value: 0.005833333333333334,
+          __typename: 'InfraNodeMetric'
+        });
+      });
+    });
+
+    it('should basically work with 1 grouping', () => {
+      return client.query({
+        query: waffleNodesQuery,
+        variables: {
+          sourceId: 'default',
+          timerange: {
+            to: 1539806283952,
+            from: 1539805341208,
+            interval: '1m'
+          },
+          metric: { type: 'cpu' },
+          path: [
+            { type: 'terms', field: 'meta.cloud.availability_zone' },
+            { type: 'hosts' }
+          ]
+        }
+      }).then(resp => {
+        const nodes = get(resp, 'data.source.map.nodes');
+        expect(nodes.length).to.equal(6);
+        const firstNode = first(nodes);
+        expect(firstNode).to.have.property('path');
+        expect(firstNode.path.length).to.equal(2);
+        expect(first(firstNode.path)).to.have.property('value', 'projects/189716325846/zones/us-central1-f');
+        expect(last(firstNode.path)).to.have.property('value', 'demo-stack-apache-01');
+      });
+    });
+
+    it('should basically work with 2 grouping', () => {
+      return client.query({
+        query: waffleNodesQuery,
+        variables: {
+          sourceId: 'default',
+          timerange: {
+            to: 1539806283952,
+            from: 1539805341208,
+            interval: '1m'
+          },
+          metric: { type: 'cpu' },
+          path: [
+            { type: 'terms', field: 'meta.cloud.provider' },
+            { type: 'terms', field: 'meta.cloud.availability_zone' },
+            { type: 'hosts' }
+          ]
+        }
+      }).then(resp => {
+        const nodes = get(resp, 'data.source.map.nodes');
+        expect(nodes.length).to.equal(6);
+        const firstNode = first(nodes);
+        expect(firstNode).to.have.property('path');
+        expect(firstNode.path.length).to.equal(3);
+        expect(first(firstNode.path)).to.have.property('value', 'gce');
+        expect(last(firstNode.path)).to.have.property('value', 'demo-stack-apache-01');
+      });
+    });
+
+  });
+}
+
+