diff --git a/tests/conftest.py b/tests/conftest.py
index a06de3cecf..79d6e00471 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -157,10 +157,8 @@ def __init__(self, name=None, imgname=None, keeptb=False, fakeplatform=None):
         self.syncd = ['syncd']
         self.rtd   = ['fpmsyncd', 'zebra', 'staticd']
         self.teamd = ['teamsyncd', 'teammgrd']
-        # FIXME: We need to verify that NAT processes are running, once the
-        # appropriate changes are merged into sonic-buildimage
-        # self.natd = ['natsyncd', 'natmgrd']
-        self.alld  = self.basicd + self.swssd + self.syncd + self.rtd + self.teamd # + self.natd
+        self.natd = ['natsyncd', 'natmgrd']
+        self.alld  = self.basicd + self.swssd + self.syncd + self.rtd + self.teamd + self.natd
         self.client = docker.from_env()
         self.appldb = None
 
diff --git a/tests/test_nat.py b/tests/test_nat.py
index d13b59e57d..19098ba1c9 100644
--- a/tests/test_nat.py
+++ b/tests/test_nat.py
@@ -8,10 +8,9 @@
 from swsscommon import swsscommon
 
 
-# FIXME: These tests depend on changes in sonic-buildimage, we need to reenable
-# them once those changes are merged.
-@pytest.mark.skip(reason="Depends on changes in sonic-buildimage")
-class TestNatFeature(object):
+# FIXME: https://github.com/Azure/sonic-swss/issues/1199
+@pytest.mark.xfail(reason="DVS crashes during NAT test execution")
+class TestNat(object):
     def setup_db(self, dvs):
         self.appdb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
         self.asicdb = swsscommon.DBConnector(1, dvs.redis_sock, 0)