diff --git a/test/e2e/es_cluster_logging.go b/test/e2e/es_cluster_logging.go
new file mode 100644
index 00000000000..a33041e2836
--- /dev/null
+++ b/test/e2e/es_cluster_logging.go
@@ -0,0 +1,334 @@
+/*
+Copyright 2015 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package e2e
+
+import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Cluster level logging using Elasticsearch", func() {
+	var c *client.Client
+
+	BeforeEach(func() {
+		var err error
+		c, err = loadClient()
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	It("should check that logs from pods on all nodes are ingested into Elasticsearch", func() {
+		ClusterLevelLoggingWithElasticsearch(c)
+	})
+})
+
+func bodyToJSON(body []byte) (map[string]interface{}, error) {
+	var r map[string]interface{}
+	if err := json.Unmarshal(body, &r); err != nil {
+		Logf("Bad JSON: %s", string(body))
+		return nil, fmt.Errorf("failed to unmarshal Elasticsearch response: %v", err)
+	}
+	return r, nil
+}
+
+// ClusterLevelLoggingWithElasticsearch is an end to end test for cluster level logging.
+func ClusterLevelLoggingWithElasticsearch(c *client.Client) {
+
+	// TODO: For now assume we are only testing cluster logging with Elasticsearch
+	// on GCE. Once we are sure that Elasticsearch cluster level logging
+	// works for other providers we should widen this scope of this test.
+	if testContext.provider != "gce" {
+		Logf("Skipping cluster level logging test for provider %s", testContext.provider)
+		return
+	}
+
+	// Check for the existence of the Elasticsearch service.
+	By("Checking the Elasticsearch service exists.")
+	const ns = api.NamespaceDefault
+	s := c.Services(ns)
+	// Make a few attempts to connect. This makes the test robust against
+	// being run as the first e2e test just after the e2e cluster has been created.
+	var err error
+	const graceTime = 5 * time.Minute
+	for start := time.Now(); time.Since(start) < graceTime; time.Sleep(5 * time.Second) {
+		if _, err = s.Get("elasticsearch-logging"); err == nil {
+			break
+		}
+		Logf("Attempt to check for the existence of the Elasticsearch service failed after %v", time.Since(start))
+	}
+	Expect(err).NotTo(HaveOccurred())
+
+	// Wait for the Elasticsearch pods to enter the running state.
+	By("Checking to make sure the Elasticsearch pods are running")
+	label := labels.SelectorFromSet(labels.Set(map[string]string{"name": "elasticsearch-logging"}))
+	pods, err := c.Pods(ns).List(label)
+	Expect(err).NotTo(HaveOccurred())
+	for _, pod := range pods.Items {
+		err = waitForPodRunning(c, pod.Name)
+		Expect(err).NotTo(HaveOccurred())
+	}
+
+	By("Checking to make sure we are talking to an Elasticsearch service.")
+	// Perform a few checks to make sure this looks like an Elasticsearch cluster.
+	var statusCode float64
+	var esResponse map[string]interface{}
+	err = nil
+	for start := time.Now(); time.Since(start) < graceTime; time.Sleep(5 * time.Second) {
+		// Query against the root URL for Elasticsearch.
+		body, err := c.Get().
+			Prefix("proxy").
+			Resource("services").
+			Name("elasticsearch-logging").
+			DoRaw()
+		if err != nil {
+			Logf("After %v proxy call to elasticsearch-loigging failed: %v", time.Since(start), err)
+			continue
+		}
+		esResponse, err = bodyToJSON(body)
+		if err != nil {
+			Logf("After %v failed to convert Elasticsearch JSON response %v to map[string]interface{}: %v", time.Since(start), string(body), err)
+			continue
+		}
+		statusIntf, ok := esResponse["status"]
+		if !ok {
+			Logf("After %v Elasticsearch response has no status field: %v", time.Since(start), esResponse)
+			continue
+		}
+		statusCode, ok = statusIntf.(float64)
+		if !ok {
+			// Assume this is a string returning Failure. Retry.
+			Logf("After %v expected status to be a float64 but got %v of type %T", time.Since(start), statusIntf, statusIntf)
+			continue
+		}
+		break
+	}
+	Expect(err).NotTo(HaveOccurred())
+	if int(statusCode) != 200 {
+		Failf("Elasticsearch cluster has a bad status: %v", statusCode)
+	}
+	// Check to see if have a cluster_name field.
+	clusterName, ok := esResponse["cluster_name"]
+	if !ok {
+		Failf("No cluster_name field in Elasticsearch response: %v", esResponse)
+	}
+	if clusterName != "kubernetes_logging" {
+		Failf("Connected to wrong cluster %q (expecting kubernetes_logging)", clusterName)
+	}
+
+	// Now assume we really are talking to an Elasticsearch instance.
+	// Check the cluster health.
+	By("Checking health of Elasticsearch service.")
+	body, err := c.Get().
+		Prefix("proxy").
+		Resource("services").
+		Name("elasticsearch-logging").
+		Suffix("_cluster/health").
+		Param("health", "pretty").
+		DoRaw()
+	Expect(err).NotTo(HaveOccurred())
+
+	health, err := bodyToJSON(body)
+	Expect(err).NotTo(HaveOccurred())
+	statusIntf, ok := health["status"]
+	if !ok {
+		Failf("No status field found in cluster health response: %v", health)
+	}
+	status := statusIntf.(string)
+	if status != "green" && status != "yellow" {
+		Failf("Cluster health has bad status: %s", status)
+	}
+
+	// Obtain a list of nodes so we can place one synthetic logger on each node.
+	nodes, err := c.Nodes().List()
+	if err != nil {
+		Failf("Failed to list nodes: %v", err)
+	}
+	nodeCount := len(nodes.Items)
+	if nodeCount == 0 {
+		Failf("Failed to find any nodes")
+	}
+
+	// Create a unique root name for the resources in this test to permit
+	// parallel executions of this test.
+	name := "synthlogger-" + string(util.NewUUID())
+	// Replace '-' characters with '_' to prevent the analyzer from breaking apart names.
+	underscoreName := strings.Replace(name, "-", "_", -1)
+
+	// podNames records the names of the synthetic logging pods that are created in the
+	// loop below.
+	var podNames []string
+	// countTo is the number of log lines emitted (and checked) for each synthetic logging pod.
+	const countTo = 100
+	// Instantiate a synthetic logger pod on each node.
+	for i, node := range nodes.Items {
+		podName := fmt.Sprintf("%s-%d", name, i)
+		_, err := c.Pods(ns).Create(&api.Pod{
+			ObjectMeta: api.ObjectMeta{
+				Name:   podName,
+				Labels: map[string]string{"name": name},
+			},
+			Spec: api.PodSpec{
+				Containers: []api.Container{
+					{
+						Name:    "synth-logger",
+						Image:   "ubuntu:14.04",
+						Command: []string{"bash", "-c", fmt.Sprintf("i=0; while ((i < %d)); do echo \"%d %s $i %s\"; i=$(($i+1)); done", countTo, i, underscoreName, podName)},
+					},
+				},
+				Host:          node.Name,
+				RestartPolicy: api.RestartPolicyNever,
+			},
+		})
+		Expect(err).NotTo(HaveOccurred())
+		podNames = append(podNames, podName)
+	}
+
+	// Cleanup the pods when we are done.
+	defer func() {
+		for _, pod := range podNames {
+			if err = c.Pods(ns).Delete(pod); err != nil {
+				Logf("Failed to delete pod %s: %v", pod, err)
+			}
+		}
+	}()
+
+	// Wait for the syntehtic logging pods to finish.
+	By("Waiting for the pods to succeed.")
+	for _, pod := range podNames {
+		err = waitForPodSuccess(c, pod, "synth-logger")
+		Expect(err).NotTo(HaveOccurred())
+	}
+
+	// Wait a bit for the log information to make it into Elasticsearch.
+	time.Sleep(30 * time.Second)
+
+	// Make several attempts to observe the logs ingested into Elasticsearch.
+	By("Checking all the log lines were ingested into Elasticsearch")
+	missing := 0
+	expected := nodeCount * countTo
+	for start := time.Now(); time.Since(start) < graceTime; time.Sleep(10 * time.Second) {
+		// Ask Elasticsearch to return all the log lines that were tagged with the underscore
+		// verison of the name. Ask for twice as many log lines as we expect to check for
+		// duplication bugs.
+		body, err = c.Get().
+			Prefix("proxy").
+			Resource("services").
+			Name("elasticsearch-logging").
+			Suffix("_search").
+			Param("q", fmt.Sprintf("log:%s", underscoreName)).
+			Param("size", strconv.Itoa(2*expected)).
+			DoRaw()
+		if err != nil {
+			Logf("After %v failed to make proxy call to elasticsearch-logging: %v", time.Since(start), err)
+			continue
+		}
+
+		response, err := bodyToJSON(body)
+		if err != nil {
+			Logf("After %v failed to unmarshal response: %v", time.Since(start), err)
+			continue
+		}
+		hits, ok := response["hits"].(map[string]interface{})
+		if !ok {
+			Failf("response[hits] not of the expected type: %T", response["hits"])
+		}
+		totalF, ok := hits["total"].(float64)
+		if !ok {
+			Logf("After %v hits[total] not of the expected type: %T", time.Since(start), hits["total"])
+			continue
+		}
+		total := int(totalF)
+		if total < expected {
+			Logf("After %v expecting to find %d log lines but saw only %d", time.Since(start), expected, total)
+			continue
+		}
+		h, ok := hits["hits"].([]interface{})
+		if !ok {
+			Logf("After %v hits not of the expected type: %T", time.Since(start), hits["hits"])
+			continue
+		}
+		// Initialize data-structure for observing counts.
+		observed := make([][]int, nodeCount)
+		for i := range observed {
+			observed[i] = make([]int, countTo)
+		}
+		// Iterate over the hits and populate the observed array.
+		for _, e := range h {
+			l, ok := e.(map[string]interface{})
+			if !ok {
+				Failf("element of hit not of expected type: %T", e)
+			}
+			source, ok := l["_source"].(map[string]interface{})
+			if !ok {
+				Failf("_source not of the expected type: %T", l["_source"])
+			}
+			msg, ok := source["log"].(string)
+			if !ok {
+				Failf("log not of the expected type: %T", source["log"])
+			}
+			words := strings.Split(msg, " ")
+			if len(words) < 4 {
+				Failf("Malformed log line: %s", msg)
+			}
+			n, err := strconv.ParseUint(words[0], 10, 0)
+			if err != nil {
+				Failf("Expecting numer of node as first field of %s", msg)
+			}
+			if n < 0 || int(n) >= nodeCount {
+				Failf("Node count index out of range: %d", nodeCount)
+			}
+			index, err := strconv.ParseUint(words[2], 10, 0)
+			if err != nil {
+				Failf("Expecting number as third field of %s", msg)
+			}
+			if index < 0 || index >= countTo {
+				Failf("Index value out of range: %d", index)
+			}
+			// Record the observation of a log line from node n at the given index.
+			observed[n][index]++
+		}
+		// Make sure we correctly observed the expected log lines from each node.
+		missing = 0
+		for n := range observed {
+			for i, c := range observed[n] {
+				if c == 0 {
+					missing++
+				}
+				if c < 0 || c > 1 {
+					Failf("Got incorrect count for node %d index %d: %d", n, i, c)
+				}
+			}
+		}
+		if missing != 0 {
+			Logf("After %v still missing %d log lines", time.Since(start), missing)
+			continue
+		}
+		Logf("After %s found all %d log lines", time.Since(start), expected)
+		return
+	}
+	Failf("Failed to find all %d log lines (%d were missing)", expected, missing)
+}