diff --git a/octodns/provider/ns1.py b/octodns/provider/ns1.py
index 04c52f6..2a3ae07 100644
--- a/octodns/provider/ns1.py
+++ b/octodns/provider/ns1.py
@@ -229,9 +229,9 @@ class Ns1Provider(BaseProvider):
 
     # Necessary for handling unsupported continents in _CONTINENT_TO_REGIONS
     _CONTINENT_TO_LIST_OF_COUNTRIES = {
-        'OC': ['FJ', 'NC', 'PG', 'SB', 'VU', 'AU', 'NF', 'NZ', 'FM', 'GU',
+        'OC': {'FJ', 'NC', 'PG', 'SB', 'VU', 'AU', 'NF', 'NZ', 'FM', 'GU',
                'KI', 'MH', 'MP', 'NR', 'PW', 'AS', 'CK', 'NU', 'PF', 'PN',
-               'TK', 'TO', 'TV', 'WF', 'WS'],
+               'TK', 'TO', 'TV', 'WF', 'WS'},
     }
 
     def __init__(self, id, api_key, retry_count=4, monitor_regions=None, *args,
@@ -367,7 +367,7 @@ class Ns1Provider(BaseProvider):
             # Oceania countries list are found, set the region to OC and remove
             # individual oceania country entries
 
-            oc_countries = []
+            oc_countries = set()
             for country in meta.get('country', []):
                 # country_alpha2_to_continent_code fails for Pitcairn ('PN')
                 if country == 'PN':
@@ -376,16 +376,19 @@ class Ns1Provider(BaseProvider):
                     con = country_alpha2_to_continent_code(country)
 
                 if con == 'OC':
-                    oc_countries.append(country)
-                geos.add('{}-{}'.format(con, country))
+                    oc_countries.add(country)
+                else:
+                    # Adding only non-OC countries here to geos
+                    geos.add('{}-{}'.format(con, country))
 
-            if len(oc_countries):
-                all_oc_countries = self._CONTINENT_TO_LIST_OF_COUNTRIES['OC']
-                if sorted(oc_countries) == sorted(all_oc_countries):
-                    # Remove oceania countries from the map, add 'OC' region
-                    for c in oc_countries:
-                        geos.remove('{}-{}'.format('OC', c))
+            if oc_countries:
+                if oc_countries == self._CONTINENT_TO_LIST_OF_COUNTRIES['OC']:
+                    # All OC countries found, so add 'OC' to geos
                     geos.add('OC')
+                else:
+                    # Partial OC countries found, just add them as-is to geos
+                    for c in oc_countries:
+                        geos.add('{}-{}'.format('OC', c))
 
             # States are easy too, just assume NA-US (CA providences aren't
             # supported by octoDNS currently)
diff --git a/tests/test_octodns_provider_ns1.py b/tests/test_octodns_provider_ns1.py
index e20b7b9..8126c23 100644
--- a/tests/test_octodns_provider_ns1.py
+++ b/tests/test_octodns_provider_ns1.py
@@ -521,12 +521,6 @@ class TestNs1Provider(TestCase):
 class TestNs1ProviderDynamic(TestCase):
     zone = Zone('unit.tests.', [])
 
-    _CONTINENT_TO_LIST_OF_COUNTRIES = {
-        'OC': ['FJ', 'NC', 'PG', 'SB', 'VU', 'AU', 'NF', 'NZ', 'FM', 'GU',
-               'KI', 'MH', 'MP', 'NR', 'PW', 'AS', 'CK', 'NU', 'PF', 'PN',
-               'TK', 'TO', 'TV', 'WF', 'WS'],
-    }
-
     record = Record.new(zone, '', {
         'dynamic': {
             'pools': {
@@ -965,8 +959,8 @@ class TestNs1ProviderDynamic(TestCase):
         saved_geos = rule0['geos']
         rule0['geos'] = ['OC']
         ret, _ = provider._params_for_A(self.record)
-        self.assertEquals(sorted(ret['regions']['lhr']['meta']['country']),
-                          sorted(self._CONTINENT_TO_LIST_OF_COUNTRIES['OC']))
+        self.assertEquals(set(ret['regions']['lhr']['meta']['country']),
+                          Ns1Provider._CONTINENT_TO_LIST_OF_COUNTRIES['OC'])
         rule0['geos'] = saved_geos
 
     @patch('octodns.provider.ns1.Ns1Provider._monitor_sync')
@@ -1137,17 +1131,18 @@ class TestNs1ProviderDynamic(TestCase):
 
         # Oceania test cases
         # 1. Full list of countries should return 'OC' in geos
-        oc_country_list = self._CONTINENT_TO_LIST_OF_COUNTRIES['OC']
-        ns1_record['regions']['lhr']['meta']['country'] = oc_country_list
+        oc_countries = Ns1Provider._CONTINENT_TO_LIST_OF_COUNTRIES['OC']
+        ns1_record['regions']['lhr']['meta']['country'] = list(oc_countries)
         data3 = provider._data_for_A('A', ns1_record)
-        assert('OC' in data3['dynamic']['rules'][0]['geos'])
+        self.assertTrue('OC' in data3['dynamic']['rules'][0]['geos'])
 
         # 2. Partial list of countries should return just those
-        partial_oc_cntry_list = oc_country_list[:5]
+        partial_oc_cntry_list = list(oc_countries)[:5]
         ns1_record['regions']['lhr']['meta']['country'] = partial_oc_cntry_list
         data4 = provider._data_for_A('A', ns1_record)
         for c in partial_oc_cntry_list:
-            assert('OC-{}'.format(c) in data4['dynamic']['rules'][0]['geos'])
+            self.assertTrue(
+                'OC-{}'.format(c) in data4['dynamic']['rules'][0]['geos'])
 
     @patch('octodns.provider.ns1.Ns1Provider._monitors_for')
     def test_extra_changes(self, monitors_for_mock):