diff --git a/test/test_ping.py b/test/test_ping.py
index 87cb45c..40ad9d4 100644
--- a/test/test_ping.py
+++ b/test/test_ping.py
@@ -7,6 +7,8 @@
 
 from framework import VppTestCase
 from util import ppp
+from vpp_ip_route import VppIpInterfaceAddress
+from vpp_neighbor import VppNeighbor
 
 """ TestPing is a subclass of  VPPTestCase classes.
 
@@ -46,6 +48,21 @@
     def show_commands_at_teardown(self):
         self.logger.info(self.vapi.cli("show hardware"))
 
+    def verify_ping_request(self, p, src, dst, seq):
+        ip = p[IP]
+        self.assertEqual(ip.version, 4)
+        self.assertEqual(ip.flags, 0)
+        self.assertEqual(ip.src, src)
+        self.assertEqual(ip.dst, dst)
+        self.assertEqual(ip.proto, 1)
+        self.assertEqual(len(ip.options), 0)
+        self.assertGreaterEqual(ip.ttl, 254)
+        icmp = p[ICMP]
+        self.assertEqual(icmp.type, 8)
+        self.assertEqual(icmp.code, 0)
+        self.assertEqual(icmp.seq, seq)
+        return icmp
+
     def test_ping_basic(self):
         """ basic ping test """
         try:
@@ -62,18 +79,8 @@
             icmp_id = None
             icmp_seq = 1
             for p in out:
-                ip = p[IP]
-                self.assertEqual(ip.version, 4)
-                self.assertEqual(ip.flags, 0)
-                self.assertEqual(ip.src, self.pg1.local_ip4)
-                self.assertEqual(ip.dst, self.pg1.remote_ip4)
-                self.assertEqual(ip.proto, 1)
-                self.assertEqual(len(ip.options), 0)
-                self.assertGreaterEqual(ip.ttl, 254)
-                icmp = p[ICMP]
-                self.assertEqual(icmp.type, 8)
-                self.assertEqual(icmp.code, 0)
-                self.assertEqual(icmp.seq, icmp_seq)
+                icmp = self.verify_ping_request(p, self.pg1.local_ip4,
+                                                self.pg1.remote_ip4, icmp_seq)
                 icmp_seq = icmp_seq + 1
                 if icmp_id is None:
                     icmp_id = icmp.id
@@ -98,18 +105,8 @@
             icmp_seq = 1
             count = 0
             for p in out:
-                ip = p[IP]
-                self.assertEqual(ip.version, 4)
-                self.assertEqual(ip.flags, 0)
-                self.assertEqual(ip.src, self.pg1.local_ip4)
-                self.assertEqual(ip.dst, self.pg1.remote_ip4)
-                self.assertEqual(ip.proto, 1)
-                self.assertEqual(len(ip.options), 0)
-                self.assertGreaterEqual(ip.ttl, 254)
-                icmp = p[ICMP]
-                self.assertEqual(icmp.type, 8)
-                self.assertEqual(icmp.code, 0)
-                self.assertEqual(icmp.seq, icmp_seq)
+                icmp = self.verify_ping_request(p, self.pg1.local_ip4,
+                                                self.pg1.remote_ip4, icmp_seq)
                 count = count + 1
                 if count >= 3:
                     icmp_seq = icmp_seq + 1
@@ -120,3 +117,36 @@
                     self.assertEqual(icmp.id, icmp_id)
         finally:
             self.vapi.cli("show error")
+
+    def test_ping_src(self):
+        """ ping with source address set """
+
+        self.pg_enable_capture(self.pg_interfaces)
+        self.pg_start()
+        self.logger.info(self.vapi.cli("show ip4 neighbors"))
+        self.logger.info(self.vapi.cli("show ip6 neighbors"))
+
+        nbr_addr = "10.0.0.2"
+        VppIpInterfaceAddress(self, self.pg1, "10.0.0.1", 24).add_vpp_config()
+        VppNeighbor(self, self.pg1.sw_if_index,
+                    "00:11:22:33:44:55",
+                    nbr_addr).add_vpp_config()
+
+        ping_cmd = "ping %s interval 0.01 repeat 3" % self.pg1.remote_ip4
+        ret = self.vapi.cli(ping_cmd)
+        out = self.pg1.get_capture(3)
+        icmp_seq = 1
+        for p in out:
+            icmp = self.verify_ping_request(p, self.pg1.local_ip4,
+                                            self.pg1.remote_ip4, icmp_seq)
+            icmp_seq = icmp_seq + 1
+
+        self.pg_enable_capture(self.pg_interfaces)
+        self.pg_start()
+        ping_cmd = "ping %s interval 0.01 repeat 3" % nbr_addr
+        ret = self.vapi.cli(ping_cmd)
+        out = self.pg1.get_capture(3)
+        icmp_seq = 1
+        for p in out:
+            icmp = self.verify_ping_request(p, "10.0.0.1", nbr_addr, icmp_seq)
+            icmp_seq = icmp_seq + 1