diff --git a/pkg/kubelet/network/kubenet/kubenet_linux.go b/pkg/kubelet/network/kubenet/kubenet_linux.go
index 50a83dae828..fcbe192ca9a 100644
--- a/pkg/kubelet/network/kubenet/kubenet_linux.go
+++ b/pkg/kubelet/network/kubenet/kubenet_linux.go
@@ -259,7 +259,7 @@ func (plugin *kubenetNetworkPlugin) Event(name string, details map[string]interf
 	if err == nil {
 		setHairpin := plugin.hairpinMode == componentconfig.HairpinVeth
 		// Set bridge address to first address in IPNet
-		cidr.IP.To4()[3] += 1
+		cidr.IP[len(cidr.IP)-1] += 1
 
 		json := fmt.Sprintf(NET_CONFIG_TEMPLATE, BridgeName, plugin.mtu, network.DefaultInterfaceName, setHairpin, podCIDR, cidr.IP.String())
 		glog.V(2).Infof("CNI network config set to %v", json)
diff --git a/pkg/kubelet/network/kubenet/kubenet_linux_test.go b/pkg/kubelet/network/kubenet/kubenet_linux_test.go
index 2e5f5a42dfb..4a1a255b6bd 100644
--- a/pkg/kubelet/network/kubenet/kubenet_linux_test.go
+++ b/pkg/kubelet/network/kubenet/kubenet_linux_test.go
@@ -232,37 +232,61 @@ func TestGenerateMacAddress(t *testing.T) {
 // TestInvocationWithoutRuntime invokes the plugin without a runtime.
 // This is how kubenet is invoked from the cri.
 func TestTearDownWithoutRuntime(t *testing.T) {
-	fhost := nettest.NewFakeHost(nil)
-	fhost.Legacy = false
-	fhost.Runtime = nil
-	mockcni := &mock_cni.MockCNI{}
-
-	fexec := &exec.FakeExec{
-		CommandScript: []exec.FakeCommandAction{},
-		LookPathFunc: func(file string) (string, error) {
-			return fmt.Sprintf("/fake-bin/%s", file), nil
+	testCases := []struct {
+		podCIDR         string
+		ip              string
+		expectedGateway string
+	}{
+		{
+			podCIDR:         "10.0.0.1/24",
+			ip:              "10.0.0.1",
+			expectedGateway: "10.0.0.1",
+		},
+		{
+			podCIDR:         "2001:beef::1/48",
+			ip:              "2001:beef::1",
+			expectedGateway: "2001:beef::1",
 		},
 	}
+	for _, tc := range testCases {
+		fhost := nettest.NewFakeHost(nil)
+		fhost.Legacy = false
+		fhost.Runtime = nil
+		mockcni := &mock_cni.MockCNI{}
 
-	kubenet := newFakeKubenetPlugin(map[kubecontainer.ContainerID]string{}, fexec, fhost)
-	kubenet.cniConfig = mockcni
-	kubenet.iptables = ipttest.NewFake()
+		fexec := &exec.FakeExec{
+			CommandScript: []exec.FakeCommandAction{},
+			LookPathFunc: func(file string) (string, error) {
+				return fmt.Sprintf("/fake-bin/%s", file), nil
+			},
+		}
 
-	details := make(map[string]interface{})
-	details[network.NET_PLUGIN_EVENT_POD_CIDR_CHANGE_DETAIL_CIDR] = "10.0.0.1/24"
-	kubenet.Event(network.NET_PLUGIN_EVENT_POD_CIDR_CHANGE, details)
+		kubenet := newFakeKubenetPlugin(map[kubecontainer.ContainerID]string{}, fexec, fhost)
+		kubenet.cniConfig = mockcni
+		kubenet.iptables = ipttest.NewFake()
 
-	existingContainerID := kubecontainer.BuildContainerID("docker", "123")
-	kubenet.podIPs[existingContainerID] = "10.0.0.1"
+		details := make(map[string]interface{})
+		details[network.NET_PLUGIN_EVENT_POD_CIDR_CHANGE_DETAIL_CIDR] = tc.podCIDR
+		kubenet.Event(network.NET_PLUGIN_EVENT_POD_CIDR_CHANGE, details)
 
-	mockcni.On("DelNetwork", mock.AnythingOfType("*libcni.NetworkConfig"), mock.AnythingOfType("*libcni.RuntimeConf")).Return(nil)
+		if kubenet.gateway.String() != tc.expectedGateway {
+			t.Errorf("generated gateway: %q, expecting: %q", kubenet.gateway.String(), tc.expectedGateway)
+		}
+		if kubenet.podCidr != tc.podCIDR {
+			t.Errorf("generated podCidr: %q, expecting: %q", kubenet.podCidr, tc.podCIDR)
+		}
+		existingContainerID := kubecontainer.BuildContainerID("docker", "123")
+		kubenet.podIPs[existingContainerID] = tc.ip
 
-	if err := kubenet.TearDownPod("namespace", "name", existingContainerID); err != nil {
-		t.Fatalf("Unexpected error in TearDownPod: %v", err)
+		mockcni.On("DelNetwork", mock.AnythingOfType("*libcni.NetworkConfig"), mock.AnythingOfType("*libcni.RuntimeConf")).Return(nil)
+
+		if err := kubenet.TearDownPod("namespace", "name", existingContainerID); err != nil {
+			t.Fatalf("Unexpected error in TearDownPod: %v", err)
+		}
+		// Assert that the CNI DelNetwork made it through and we didn't crash
+		// without a runtime.
+		mockcni.AssertExpectations(t)
 	}
-	// Assert that the CNI DelNetwork made it through and we didn't crash
-	// without a runtime.
-	mockcni.AssertExpectations(t)
 }
 
 //TODO: add unit test for each implementation of network plugin interface