diff --git a/awips/test/dafTests/baseRadarTestCase.py b/awips/test/dafTests/baseRadarTestCase.py
index e312d56..afbe040 100644
--- a/awips/test/dafTests/baseRadarTestCase.py
+++ b/awips/test/dafTests/baseRadarTestCase.py
@@ -83,11 +83,6 @@ class BaseRadarTestCase(baseDafTestCase.DafTestCase):
         for record in gridData:
             self.assertEqual(record.getAttribute('icao'), self.radarLoc)
 
-    def testGetDataWithEqualsUnicode(self):
-        gridData = self.runConstraintTest('icao', '=', unicode(self.radarLoc))
-        for record in gridData:
-            self.assertEqual(record.getAttribute('icao'), self.radarLoc)
-
     def testGetDataWithEqualsInt(self):
         gridData = self.runConstraintTest('icao', '=', 1000)
         for record in gridData:
diff --git a/awips/test/dafTests/testAirep.py b/awips/test/dafTests/testAirep.py
index 2ca75d0..381ed11 100644
--- a/awips/test/dafTests/testAirep.py
+++ b/awips/test/dafTests/testAirep.py
@@ -66,11 +66,6 @@ class AirepTestCase(baseDafTestCase.DafTestCase):
         for record in geometryData:
             self.assertEqual(record.getString('reportType'), 'AIREP')
 
-    def testGetDataWithEqualsUnicode(self):
-        geometryData = self._runConstraintTest('reportType', '=', u'AIREP')
-        for record in geometryData:
-            self.assertEqual(record.getString('reportType'), 'AIREP')
-
     # No numeric tests since no numeric identifiers are available.
 
     def testGetDataWithEqualsNone(self):
diff --git a/awips/test/dafTests/testBinLightning.py b/awips/test/dafTests/testBinLightning.py
index f9952c3..02e6382 100644
--- a/awips/test/dafTests/testBinLightning.py
+++ b/awips/test/dafTests/testBinLightning.py
@@ -86,11 +86,6 @@ class BinLightningTestCase(baseDafTestCase.DafTestCase):
         for record in geomData:
             self.assertEqual(record.getAttribute('source'), self.source)
 
-    def testGetDataWithEqualsUnicode(self):
-        geomData = self._runConstraintTest('source', '=', self.source)
-        for record in geomData:
-            self.assertEqual(record.getAttribute('source'), self.source)
-
     def testGetDataWithEqualsInt(self):
         geomData = self._runConstraintTest('source', '=', 1000)
         for record in geomData:
diff --git a/awips/test/dafTests/testBufrUa.py b/awips/test/dafTests/testBufrUa.py
index 6f51290..d2b1c6a 100644
--- a/awips/test/dafTests/testBufrUa.py
+++ b/awips/test/dafTests/testBufrUa.py
@@ -105,11 +105,6 @@ class BufrUaTestCase(baseDafTestCase.DafTestCase):
         for record in geometryData:
             self.assertEqual(record.getString('rptType'), '2022')
 
-    def testGetDataWithEqualsUnicode(self):
-        geometryData = self._runConstraintTest('reportType', '=', u'2022')
-        for record in geometryData:
-            self.assertEqual(record.getString('rptType'), '2022')
-
     def testGetDataWithEqualsInt(self):
         geometryData = self._runConstraintTest('reportType', '=', 2022)
         for record in geometryData:
diff --git a/awips/test/dafTests/testClimate.py b/awips/test/dafTests/testClimate.py
new file mode 100644
index 0000000..794eb80
--- /dev/null
+++ b/awips/test/dafTests/testClimate.py
@@ -0,0 +1,424 @@
+#
+# Test DAF support for climate data
+#
+#     SOFTWARE HISTORY
+#
+#    Date            Ticket#       Engineer       Description
+#    ------------    ----------    -----------    --------------------------
+#    01/19/16        4795          mapeters       Initial Creation.
+#    04/11/16        5548          tgurney        Cleanup
+#    04/18/16        5548          tgurney        More cleanup
+#    04/26/16        5587          tgurney        Add identifier values tests
+#    06/09/16        5574          mapeters       Add advanced query tests, Short parameter test
+#    06/13/16        5574          tgurney        Fix checks for None
+#    06/21/16        5548          tgurney        Skip tests that cause errors
+#    06/30/16        5725          tgurney        Add test for NOT IN
+#    10/06/16        5926          dgilling       Add additional time and location tests.
+#    12/07/16        5981          tgurney        Parameterize
+#    12/20/16        5981          tgurney        Add envelope test
+#    08/16/17        6388          tgurney        Test for duplicate data
+#
+#
+
+from __future__ import print_function
+import datetime
+from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
+from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
+from awips.dataaccess import DataAccessLayer as DAL
+from awips.ThriftClient import ThriftRequestException
+
+from awips.test.dafTests import baseDafTestCase
+from awips.test.dafTests import params
+import unittest
+
+
+class ClimateTestCase(baseDafTestCase.DafTestCase):
+    """Test DAF support for climate data"""
+
+    datatype = 'climate'
+    obsStation = params.OBS_STATION
+
+    def testGetAvailableParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_monthly')
+        self.runParametersTest(req)
+
+    def testGetAvailableLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_monthly')
+        self.runLocationsTest(req)
+
+    def testGetAvailableLocationsForRptTable(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.rpt')
+        self.runLocationsTest(req)
+
+    def testGetAvailableLocationsForStationId(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.day_climate_norm')
+        self.runLocationsTest(req)
+
+    def testGetAvailableLocationsForInformId(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_mon_season_yr')
+        self.runLocationsTest(req)
+
+    def testGetAvailableLocationsWithConstraints(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_monthly')
+        req.addIdentifier('maxtemp_mon', RequestConstraint.new('>', 95))
+        self.runLocationsTest(req)
+
+    def testGetAvailableLocationsWithInvalidTable(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.boolean_values')
+        with self.assertRaises(ThriftRequestException) as cm:
+            DAL.getAvailableLocationNames(req)
+        self.assertIn('IncompatibleRequestException', str(cm.exception))
+
+    def testGetAvailableTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_monthly')
+        req.setParameters('maxtemp_mon', 'min_sea_press')
+        self.runTimesTest(req)
+
+    def testGetAvailableTimesWithLocationNamesForYearMonth(self):
+        """
+        Test retrieval of times for a climo table that uses year and
+        month columns to build DataTimes.
+        """
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_monthly')
+        req.setLocationNames(self.obsStation, 'KABR', 'KDMO')
+        req.setParameters('maxtemp_mon', 'min_sea_press')
+        self.runTimesTest(req)
+
+    def testGetAvailableTimesWithLocationNamesForYearDayOfYear(self):
+        """
+        Test retrieval of times for a climo table that uses year and
+        day_of_year columns to build DataTimes.
+        """
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_daily')
+        req.setLocationNames(self.obsStation, 'KABR', 'KDMO')
+        req.setParameters('maxtemp_cal', 'min_press')
+        self.runTimesTest(req)
+
+    def testGetAvailableTimesWithLocationNamesForPeriod(self):
+        """
+        Test retrieval of times for a climo table that uses
+        period_start and period_end columns to build DataTimes.
+        """
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_mon_season_yr')
+        req.setLocationNames(self.obsStation, 'KABR', 'KDMO')
+        req.setParameters('max_temp', 'precip_total')
+        self.runTimesTest(req)
+
+    def testGetAvailableTimesWithLocationNamesForDate(self):
+        """
+        Test retrieval of times for a climo table that uses a date
+        column to build DataTimes.
+        """
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.daily_climate')
+        req.setLocationNames(self.obsStation, 'KABR', 'KDMO')
+        req.setParameters('max_temp', 'precip', 'avg_wind_speed')
+        self.runTimesTest(req)
+
+    def testGetAvailableTimesWithConstraint(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_monthly')
+        req.addIdentifier('maxtemp_mon', RequestConstraint.new('<', 75))
+        req.setParameters('maxtemp_mon', 'min_sea_press')
+        self.runTimesTest(req)
+
+    def testGetGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_monthly')
+        req.setLocationNames('KFNB')
+        req.setParameters('maxtemp_mon', 'min_sea_press')
+        self.runGeometryDataTest(req)
+
+    def testGetGeometryDataWithEnvelopeThrowsException(self):
+        # Envelope is not used
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_monthly')
+        req.setParameters('maxtemp_mon', 'min_sea_press')
+        req.setEnvelope(params.ENVELOPE)
+        with self.assertRaises(Exception):
+            data = self.runGeometryDataTest(req)
+
+    def testGetGeometryDataForYearAndDayOfYearTable(self):
+        """
+        Test retrieval of data for a climo table that uses year and
+        day_of_year columns to build DataTimes.
+        """
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_daily')
+        req.setLocationNames('KFNB')
+        req.setParameters('maxtemp_cal', 'min_press')
+        self.runGeometryDataTest(req)
+
+    def testGetGeometryDataForPeriodTable(self):
+        """
+        Test retrieval of data for a climo table that uses a period_start and
+        period_end columns to build DataTimes.
+        """
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_mon_season_yr')
+        req.setLocationNames('KFNB')
+        req.setParameters('max_temp', 'precip_total')
+        self.runGeometryDataTest(req)
+
+    def testGetGeometryDataForDateTable(self):
+        """
+        Test retrieval of data for a climo table that uses a date column to
+        build DataTimes.
+        """
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.daily_climate')
+        req.setLocationNames('KFNB')
+        req.setParameters('max_temp', 'precip', 'avg_wind_speed')
+        self.runGeometryDataTest(req)
+
+    def testGetGeometryDataWithShortParameter(self):
+        """
+        Test that a parameter that is stored in Java as a Short is correctly
+        retrieved as a number.
+        """
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'cli_asos_monthly')
+        req.setParameters('month')
+        geometryData = self.runGeometryDataTest(req)
+        for record in geometryData:
+            self.assertIsNotNone(record.getNumber('month'))
+
+    def testGetTableIdentifierValues(self):
+        self.runGetIdValuesTest(['table'])
+
+    def testGetColumnIdValuesWithTable(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_monthly')
+        idValues = DAL.getIdentifierValues(req, 'year')
+        self.assertTrue(hasattr(idValues, '__iter__'))
+
+    def testGetColumnIdValuesWithoutTableThrowsException(self):
+        req = DAL.newDataRequest(self.datatype)
+        with self.assertRaises(ThriftRequestException):
+            DAL.getIdentifierValues(req, 'year')
+
+    @unittest.skip('avoid EDEX error')
+    def testGetColumnIdValuesWithNonexistentTableThrowsException(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'nonexistentjunk')
+        with self.assertRaises(ThriftRequestException):
+            DAL.getIdentifierValues(req, 'year')
+
+    @unittest.skip('avoid EDEX error')
+    def testGetNonexistentColumnIdValuesThrowsException(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_monthly')
+        with self.assertRaises(ThriftRequestException):
+            DAL.getIdentifierValues(req, 'nonexistentjunk')
+
+    def testGetInvalidIdentifierValuesThrowsException(self):
+        self.runInvalidIdValuesTest()
+
+    def testGetNonexistentIdentifierValuesThrowsException(self):
+        self.runNonexistentIdValuesTest()
+
+    def _runConstraintTest(self, key, operator, value):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'cli_asos_monthly')
+        constraint = RequestConstraint.new(operator, value)
+        req.addIdentifier(key, constraint)
+        req.setParameters('station_code', 'avg_daily_max')
+        return self.runGeometryDataTest(req)
+
+    def testGetDataWithEqualsString(self):
+        geometryData = self._runConstraintTest('station_code', '=', self.obsStation)
+        for record in geometryData:
+            self.assertEqual(record.getString('station_code'), self.obsStation)
+
+    def testGetDataWithEqualsUnicode(self):
+        geometryData = self._runConstraintTest('station_code', '=', unicode(self.obsStation))
+        for record in geometryData:
+            self.assertEqual(record.getString('station_code'), self.obsStation)
+
+    def testGetDataWithEqualsInt(self):
+        geometryData = self._runConstraintTest('avg_daily_max', '=', 70)
+        for record in geometryData:
+            self.assertEqual(record.getNumber('avg_daily_max'), 70)
+
+    def testGetDataWithEqualsLong(self):
+        geometryData = self._runConstraintTest('avg_daily_max', '=', 70)
+        for record in geometryData:
+            self.assertEqual(record.getNumber('avg_daily_max'), 70)
+
+    def testGetDataWithEqualsFloat(self):
+        geometryData = self._runConstraintTest('avg_daily_max', '=', 69.2)
+        for record in geometryData:
+            self.assertEqual(round(record.getNumber('avg_daily_max'), 1), 69.2)
+
+    def testGetDataWithEqualsNone(self):
+        geometryData = self._runConstraintTest('station_code', '=', None)
+        self.assertEqual(len(geometryData), 0)
+
+    def testGetDataWithNotEquals(self):
+        geometryData = self._runConstraintTest('station_code', '!=', self.obsStation)
+        for record in geometryData:
+            self.assertNotEqual(record.getString('station_code'), self.obsStation)
+
+    def testGetDataWithNotEqualsNone(self):
+        geometryData = self._runConstraintTest('station_code', '!=', None)
+        for record in geometryData:
+            self.assertNotEqual(record.getType('station_code'), 'NULL')
+
+    def testGetDataWithGreaterThan(self):
+        geometryData = self._runConstraintTest('avg_daily_max', '>', 70)
+        for record in geometryData:
+            self.assertGreater(record.getNumber('avg_daily_max'), 70)
+
+    def testGetDataWithLessThan(self):
+        geometryData = self._runConstraintTest('avg_daily_max', '<', 70)
+        for record in geometryData:
+            self.assertLess(record.getNumber('avg_daily_max'), 70)
+
+    def testGetDataWithGreaterThanEquals(self):
+        geometryData = self._runConstraintTest('avg_daily_max', '>=', 70)
+        for record in geometryData:
+            self.assertGreaterEqual(record.getNumber('avg_daily_max'), 70)
+
+    def testGetDataWithLessThanEquals(self):
+        geometryData = self._runConstraintTest('avg_daily_max', '<=', 70)
+        for record in geometryData:
+            self.assertLessEqual(record.getNumber('avg_daily_max'), 70)
+
+    def testGetDataWithInTuple(self):
+        collection = (self.obsStation, 'KABR')
+        geometryData = self._runConstraintTest('station_code', 'in', collection)
+        for record in geometryData:
+            self.assertIn(record.getString('station_code'), collection)
+
+    def testGetDataWithInList(self):
+        collection = [self.obsStation, 'KABR']
+        geometryData = self._runConstraintTest('station_code', 'in', collection)
+        for record in geometryData:
+            self.assertIn(record.getString('station_code'), collection)
+
+    def testGetDataWithInGenerator(self):
+        collection = (self.obsStation, 'KABR')
+        generator = (item for item in collection)
+        geometryData = self._runConstraintTest('station_code', 'in', generator)
+        for record in geometryData:
+            self.assertIn(record.getString('station_code'), collection)
+
+    def testGetDataWithNotInList(self):
+        collection = ['KORD', 'KABR']
+        geometryData = self._runConstraintTest('station_code', 'not in', collection)
+        for record in geometryData:
+            self.assertNotIn(record.getString('station_code'), collection)
+
+    def testGetDataWithInvalidConstraintTypeThrowsException(self):
+        with self.assertRaises(ValueError):
+            self._runConstraintTest('station_code', 'junk', self.obsStation)
+
+    def testGetDataWithInvalidConstraintValueThrowsException(self):
+        with self.assertRaises(TypeError):
+            self._runConstraintTest('station_code', '=', {})
+
+    def testGetDataWithEmptyInConstraintThrowsException(self):
+        with self.assertRaises(ValueError):
+            self._runConstraintTest('station_code', 'in', [])
+
+    def testGetDataWithTimeRangeWithYearAndMonth1(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_monthly')
+        req.setLocationNames('KFNB')
+        req.setParameters('maxtemp_mon', 'min_sea_press')
+        startTime = datetime.datetime(2009, 1, 1)
+        endTime = datetime.datetime(2009, 12, 31)
+        tr = TimeRange(startTime, endTime)
+        self.runGeometryDataTestWithTimeRange(req, tr)
+
+    def testGetDataWithTimeRangeWithYearAndMonth2(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_monthly')
+        req.setLocationNames('KFNB')
+        req.setParameters('maxtemp_mon', 'min_sea_press')
+        startTime = datetime.datetime(2008, 1, 1)
+        endTime = datetime.datetime(2009, 3, 31)
+        tr = TimeRange(startTime, endTime)
+        self.runGeometryDataTestWithTimeRange(req, tr)
+
+    def testGetDataWithTimeRangeWithYearAndMonth3(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_monthly')
+        req.setLocationNames('KFNB')
+        req.setParameters('maxtemp_mon', 'min_sea_press')
+        startTime = datetime.datetime(2007, 7, 1)
+        endTime = datetime.datetime(2009, 3, 31)
+        tr = TimeRange(startTime, endTime)
+        self.runGeometryDataTestWithTimeRange(req, tr)
+
+    def testGetDataWithTimeRangeWithYearAndDayOfYear1(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_daily')
+        req.setLocationNames('KFNB')
+        req.setParameters('maxtemp_cal', 'min_press')
+        startTime = datetime.datetime(2009, 1, 1)
+        endTime = datetime.datetime(2009, 7, 31)
+        tr = TimeRange(startTime, endTime)
+        self.runGeometryDataTestWithTimeRange(req, tr)
+
+    def testGetDataWithTimeRangeWithYearAndDayOfYear2(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_daily')
+        req.setLocationNames('KFNB')
+        req.setParameters('maxtemp_cal', 'min_press')
+        startTime = datetime.datetime(2008, 7, 1)
+        endTime = datetime.datetime(2009, 3, 31)
+        tr = TimeRange(startTime, endTime)
+        self.runGeometryDataTestWithTimeRange(req, tr)
+
+    def testGetDataWithTimeRangeWithYearAndDayOfYear3(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_daily')
+        req.setLocationNames('KFNB')
+        req.setParameters('maxtemp_cal', 'min_press')
+        startTime = datetime.datetime(2007, 7, 1)
+        endTime = datetime.datetime(2009, 3, 31)
+        tr = TimeRange(startTime, endTime)
+        self.runGeometryDataTestWithTimeRange(req, tr)
+
+    def testGetDataWithTimeRangeWithPeriodTable(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_mon_season_yr')
+        req.setLocationNames('KFNB')
+        req.setParameters('max_temp', 'precip_total')
+        startTime = datetime.datetime(2007, 7, 1)
+        endTime = datetime.datetime(2009, 3, 31)
+        tr = TimeRange(startTime, endTime)
+        self.runGeometryDataTestWithTimeRange(req, tr)
+
+    def testGetDataWithTimeRangeWithForDateTable(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.daily_climate')
+        req.setLocationNames('KFNB')
+        req.setParameters('max_temp', 'precip', 'avg_wind_speed')
+        startTime = datetime.datetime(2007, 7, 1)
+        endTime = datetime.datetime(2009, 3, 31)
+        tr = TimeRange(startTime, endTime)
+        self.runGeometryDataTestWithTimeRange(req, tr)
+
+    def testNoDuplicateData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier('table', 'public.cli_asos_monthly')
+        req.setLocationNames('KOMA')
+        req.setParameters('maxtemp_day1')
+        rows = DAL.getGeometryData(req, DAL.getAvailableTimes(req)[0:5])
+        for i in range(len(rows)):
+            for j in range(len(rows)):
+                if i != j:
+                    self.assertNotEqual(rows[i].__dict__, rows[j].__dict__)
diff --git a/awips/test/dafTests/testCommonObsSpatial.py b/awips/test/dafTests/testCommonObsSpatial.py
index 169a00e..acb9310 100644
--- a/awips/test/dafTests/testCommonObsSpatial.py
+++ b/awips/test/dafTests/testCommonObsSpatial.py
@@ -64,11 +64,6 @@ class CommonObsSpatialTestCase(baseDafTestCase.DafTestCase):
         for record in geometryData:
             self.assertEqual(record.getString('state'), 'NE')
 
-    def testGetDataWithEqualsUnicode(self):
-        geometryData = self._runConstraintTest('state', '=', u'NE')
-        for record in geometryData:
-            self.assertEqual(record.getString('state'), 'NE')
-
     def testGetDataWithEqualsInt(self):
         geometryData = self._runConstraintTest('catalogtype', '=', 32)
         for record in geometryData:
diff --git a/awips/test/dafTests/testGfe.py b/awips/test/dafTests/testGfe.py
index 41da163..e80ac48 100644
--- a/awips/test/dafTests/testGfe.py
+++ b/awips/test/dafTests/testGfe.py
@@ -139,11 +139,6 @@ class GfeTestCase(baseDafTestCase.DafTestCase):
         for record in gridData:
             self.assertEqual(record.getAttribute('parmId.dbId.dbType'), 'Prac')
 
-    def testGetDataWithEqualsUnicode(self):
-        gridData = self._runConstraintTest('parmId.dbId.modelName', '=', u'Fcst')
-        for record in gridData:
-            self.assertEqual(record.getAttribute('parmId.dbId.modelName'), 'Fcst')
-
     # No numeric tests since no numeric identifiers are available.
 
     def testGetDataWithEqualsNone(self):
diff --git a/awips/test/dafTests/testGrid.py b/awips/test/dafTests/testGrid.py
index 7ed464d..935d281 100644
--- a/awips/test/dafTests/testGrid.py
+++ b/awips/test/dafTests/testGrid.py
@@ -124,11 +124,6 @@ class GridTestCase(baseDafTestCase.DafTestCase):
         for record in gridData:
             self.assertEqual(record.getAttribute('info.level.levelonevalue'), 2000.0)
 
-    def testGetDataWithEqualsUnicode(self):
-        gridData = self._runConstraintTest('info.level.levelonevalue', '=', u'2000.0')
-        for record in gridData:
-            self.assertEqual(record.getAttribute('info.level.levelonevalue'), 2000.0)
-
     def testGetDataWithEqualsInt(self):
         gridData = self._runConstraintTest('info.level.levelonevalue', '=', 2000)
         for record in gridData:
diff --git a/awips/test/dafTests/testMaps.py b/awips/test/dafTests/testMaps.py
index 48e290e..2afcecc 100644
--- a/awips/test/dafTests/testMaps.py
+++ b/awips/test/dafTests/testMaps.py
@@ -105,11 +105,6 @@ class MapsTestCase(baseDafTestCase.DafTestCase):
         for record in geometryData:
             self.assertEqual(record.getString('state'), 'NE')
 
-    def testGetDataWithEqualsUnicode(self):
-        geometryData = self._runConstraintTest('state', '=', u'NE')
-        for record in geometryData:
-            self.assertEqual(record.getString('state'), 'NE')
-
     def testGetDataWithEqualsInt(self):
         geometryData = self._runConstraintTest('reservoir', '=', 1)
         for record in geometryData:
diff --git a/awips/test/dafTests/testModelSounding.py b/awips/test/dafTests/testModelSounding.py
index 618203e..15bb80e 100644
--- a/awips/test/dafTests/testModelSounding.py
+++ b/awips/test/dafTests/testModelSounding.py
@@ -121,11 +121,6 @@ class ModelSoundingTestCase(baseDafTestCase.DafTestCase):
         for record in geometryData:
             self.assertIn('/ETA/', record.getString('dataURI'))
 
-    def testGetDataWithEqualsUnicode(self):
-        geometryData = self._runConstraintTest('reportType', '=', u'ETA')
-        for record in geometryData:
-            self.assertIn('/ETA/', record.getString('dataURI'))
-
     # No numeric tests since no numeric identifiers are available.
 
     def testGetDataWithEqualsNone(self):
diff --git a/awips/test/dafTests/testObs.py b/awips/test/dafTests/testObs.py
index 0f41e8d..b0d27d2 100644
--- a/awips/test/dafTests/testObs.py
+++ b/awips/test/dafTests/testObs.py
@@ -80,11 +80,6 @@ class ObsTestCase(baseDafTestCase.DafTestCase):
         for record in geometryData:
             self.assertEqual(record.getString('reportType'), 'METAR')
 
-    def testGetDataWithEqualsUnicode(self):
-        geometryData = self._runConstraintTest('reportType', '=', u'METAR')
-        for record in geometryData:
-            self.assertEqual(record.getString('reportType'), 'METAR')
-
     # No numeric tests since no numeric identifiers are available.
 
     def testGetDataWithEqualsNone(self):
diff --git a/awips/test/dafTests/testRadarSpatial.py b/awips/test/dafTests/testRadarSpatial.py
index 00c68d5..2a6864c 100644
--- a/awips/test/dafTests/testRadarSpatial.py
+++ b/awips/test/dafTests/testRadarSpatial.py
@@ -25,7 +25,6 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import R
 from awips.test.dafTests import baseDafTestCase
 from awips.test.dafTests import params
 
-
 class RadarSpatialTestCase(baseDafTestCase.DafTestCase):
     """Test DAF support for radar_spatial data"""
 
@@ -65,11 +64,6 @@ class RadarSpatialTestCase(baseDafTestCase.DafTestCase):
         for record in geometryData:
             self.assertEqual(record.getString('wfo_id'), params.SITE_ID)
 
-    def testGetDataWithEqualsUnicode(self):
-        geometryData = self._runConstraintTest('wfo_id', '=', unicode(params.SITE_ID))
-        for record in geometryData:
-            self.assertEqual(record.getString('wfo_id'), params.SITE_ID)
-
     def testGetDataWithEqualsInt(self):
         geometryData = self._runConstraintTest('immutablex', '=', 57)
         for record in geometryData:
diff --git a/awips/test/dafTests/testSatellite.py b/awips/test/dafTests/testSatellite.py
index 089f02d..92c5264 100644
--- a/awips/test/dafTests/testSatellite.py
+++ b/awips/test/dafTests/testSatellite.py
@@ -73,11 +73,6 @@ class SatelliteTestCase(baseDafTestCase.DafTestCase):
         for record in gridData:
             self.assertEqual(record.getAttribute('creatingEntity'), 'Composite')
 
-    def testGetDataWithEqualsUnicode(self):
-        gridData = self._runConstraintTest('creatingEntity', '=', u'Composite')
-        for record in gridData:
-            self.assertEqual(record.getAttribute('creatingEntity'), 'Composite')
-
     def testGetDataWithEqualsInt(self):
         gridData = self._runConstraintTest('creatingEntity', '=', 1000)
         for record in gridData:
diff --git a/awips/test/dafTests/testSfcObs.py b/awips/test/dafTests/testSfcObs.py
index 0db49f8..7abeda4 100644
--- a/awips/test/dafTests/testSfcObs.py
+++ b/awips/test/dafTests/testSfcObs.py
@@ -76,11 +76,6 @@ class SfcObsTestCase(baseDafTestCase.DafTestCase):
         for record in geometryData:
             self.assertEqual(record.getString('reportType'), '1004')
 
-    def testGetDataWithEqualsUnicode(self):
-        geometryData = self._runConstraintTest('reportType', '=', u'1004')
-        for record in geometryData:
-            self.assertEqual(record.getString('reportType'), '1004')
-
     def testGetDataWithEqualsInt(self):
         geometryData = self._runConstraintTest('reportType', '=', 1004)
         for record in geometryData:
diff --git a/awips/test/dafTests/testWarning.py b/awips/test/dafTests/testWarning.py
index de2fa3f..a125823 100644
--- a/awips/test/dafTests/testWarning.py
+++ b/awips/test/dafTests/testWarning.py
@@ -115,11 +115,6 @@ class WarningTestCase(baseDafTestCase.DafTestCase):
         for record in geometryData:
             self.assertEqual(record.getString('sig'), 'Y')
 
-    def testGetDataWithEqualsUnicode(self):
-        geometryData = self._runConstraintTest('sig', '=', u'Y')
-        for record in geometryData:
-            self.assertEqual(record.getString('sig'), 'Y')
-
     def testGetDataWithEqualsInt(self):
         geometryData = self._runConstraintTest('etn', '=', 1000)
         for record in geometryData: