diff -up netcdf4-python-1.2.2rel/Changelog.numpy1.11 netcdf4-python-1.2.2rel/Changelog
diff -up netcdf4-python-1.2.2rel/test/tst_masked.py.numpy1.11 netcdf4-python-1.2.2rel/test/tst_masked.py
--- netcdf4-python-1.2.2rel/test/tst_masked.py.numpy1.11	2015-12-31 09:07:06.000000000 -0700
+++ netcdf4-python-1.2.2rel/test/tst_masked.py	2016-02-05 16:44:44.341533935 -0700
@@ -28,7 +28,8 @@ ranarr[::2] = missing_value
 ranarr2[::2] = missing_value2
 NP.seterr(invalid='ignore') # silence warnings from ma.masked_values
 maskedarr = ma.masked_values(ranarr,missing_value)
-maskedarr2 = ma.masked_values(ranarr2,missing_value2)
+#maskedarr2 = ma.masked_values(ranarr2,missing_value2)
+maskedarr2 = ma.masked_invalid(ranarr2)
 scale_factor = (packeddata.max()-packeddata.min())/(2.*32766.)
 add_offset = 0.5*(packeddata.max()+packeddata.min())
 packeddata2 = NP.around((packeddata-add_offset)/scale_factor).astype('i2')
diff --git a/test/tst_multifile.py b/test/tst_multifile.py
index 3e4c1dc..ffe5106 100644
--- a/test/tst_multifile.py
+++ b/test/tst_multifile.py
@@ -29,7 +29,7 @@ def setUp(self):
             dat = f.createVariable('data','i',('x','y','z',))
             dat.long_name = 'phony data'
             dat.missing_value = missval
-            nx1 = nfile*ninc; nx2 = ninc*(nfile+1)
+            nx1 = int(nfile*ninc); nx2 = int(ninc*(nfile+1))
             #x[0:ninc] = np.arange(nfile*ninc,ninc*(nfile+1))
             x[:] = np.arange(nfile*ninc,ninc*(nfile+1))
             #dat[0:ninc] = data[nx1:nx2]
diff --git a/test/tst_multifile2.py b/test/tst_multifile2.py
index 0a59013..34b21a1 100644
--- a/test/tst_multifile2.py
+++ b/test/tst_multifile2.py
@@ -30,7 +30,7 @@ def setUp(self):
             dat = f.createVariable('data','i',('x','y','z',))
             dat.long_name = 'phony data'
             dat.missing_value = missval
-            nx1 = nfile*ninc; nx2 = ninc*(nfile+1)
+            nx1 = int(nfile*ninc); nx2 = int(ninc*(nfile+1))
             #x[0:ninc] = np.arange(nfile*ninc,ninc*(nfile+1))
             x[:] = np.arange(nfile*ninc,ninc*(nfile+1))
             #dat[0:ninc] = data[nx1:nx2]