diff --git a/test/be_data.h5 b/test/be_data.h5
index ebabae5a87..7fc9ef73b0 100644
Binary files a/test/be_data.h5 and b/test/be_data.h5 differ
diff --git a/test/cross_read.c b/test/cross_read.c
index 92802af75b..b3f6d33ed2 100755
--- a/test/cross_read.c
+++ b/test/cross_read.c
@@ -32,7 +32,7 @@ const char *FILENAME[] = {
 };
 
 #define DATASETNAME        "Array"
-#define DATASETNAME2       "Scale_offset_float_data"
+#define DATASETNAME2       "Scale_offset_double_data"
 #define DATASETNAME3       "Scale_offset_int_data"
 #define NX 		6         
 #define NY 		6
@@ -62,6 +62,8 @@ static int read_data(char *fname)
     hid_t	dt;
     float       data_in[NX][NY]; /* input buffer */
     float       data_out[NX][NY]; /* output buffer */
+    double      double_data_in[NX][NY]; /* input buffer */
+    double      double_data_out[NX][NY]; /* output buffer */
     int         int_data_in[NX][NY]; /* input buffer */
     int         int_data_out[NX][NY]; /* output buffer */
     int         i, j;
@@ -154,7 +156,7 @@ static int read_data(char *fname)
 
     PASSED();
 
-    TESTING("	dataset of FLOAT with scale-offset filter");
+    TESTING("	dataset of DOUBLE with scale-offset filter");
 #ifdef TMP
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
     /* 
@@ -168,8 +170,8 @@ static int read_data(char *fname)
      */
     for (j = 0; j < NX; j++) {
 	for (i = 0; i < NY; i++) {
-	    data_in[j][i] = ((float)(i + j + 1))/3;
-	    data_out[j][i] = 0;
+	    double_data_in[j][i] = ((double)(i + j + 1))/3;
+	    double_data_out[j][i] = 0;
         }
     }
 
@@ -186,17 +188,17 @@ static int read_data(char *fname)
      * Read data from hyperslab in the file into the hyperslab in
      * memory and display.
      */
-    if(H5Dread(dataset, datatype, H5S_ALL, H5S_ALL, H5P_DEFAULT, data_out) < 0)
+    if(H5Dread(dataset, datatype, H5S_ALL, H5S_ALL, H5P_DEFAULT, double_data_out) < 0)
         TEST_ERROR;
 
     /* Check results */
     for (j=0; j<NX; j++) {
         for (i=0; i<NY; i++) {
-            if (!DBL_REL_EQUAL(data_out[j][i], data_in[j][i], 0.001)) {
+            if (!DBL_REL_EQUAL(double_data_out[j][i], double_data_in[j][i], 0.001)) {
                 if (!nerrors++) {
                     H5_FAILED();
                     printf("element [%d][%d] is %g but should have been %g\n",
-                           j, i, data_out[j][i], data_in[j][i]);
+                           j, i, double_data_out[j][i], double_data_in[j][i]);
                 }
             }
         }
diff --git a/test/gen_cross.c b/test/gen_cross.c
index 9b9b425e98..0bc3460b39 100755
--- a/test/gen_cross.c
+++ b/test/gen_cross.c
@@ -28,7 +28,7 @@
 
 #define H5FILE_NAME        "data.h5"
 #define DATASETNAME        "Array"
-#define DATASETNAME2       "Scale_offset_float_data"
+#define DATASETNAME2       "Scale_offset_double_data"
 #define DATASETNAME3       "Scale_offset_int_data"
 #define NX                 6
 #define NY                 6
@@ -37,7 +37,7 @@
 #define CHUNK1             3
 
 int create_normal_dset(hid_t fid, hid_t sid);
-int create_scale_offset_dset_float(hid_t fid, hid_t sid);
+int create_scale_offset_dset_double(hid_t fid, hid_t sid);
 int create_scale_offset_dset_int(hid_t fid, hid_t sid);
 
 
@@ -103,9 +103,9 @@ create_normal_dset(hid_t fid, hid_t sid)
 
 
 /*-------------------------------------------------------------------------
- * Function:    create_scale_offset_dset_float
+ * Function:    create_scale_offset_dset_double
  *
- * Purpose:     Create a dataset of FLOAT datatype with scale-offset filter
+ * Purpose:     Create a dataset of DOUBLE datatype with scale-offset filter
  *
  * Return:      Success:        0
  *              Failure:        -1
@@ -118,13 +118,13 @@ create_normal_dset(hid_t fid, hid_t sid)
  *-------------------------------------------------------------------------
  */
 int
-create_scale_offset_dset_float(hid_t fid, hid_t sid)
+create_scale_offset_dset_double(hid_t fid, hid_t sid)
 {
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
     hid_t       dataset;         /* dataset handles */
     hid_t       dcpl;
     herr_t      status;
-    float       data[NX][NY];          /* data to write */
+    double       data[NX][NY];          /* data to write */
     hsize_t     chunk[RANK] = {CHUNK0, CHUNK1};
     int         i, j;
 
@@ -133,7 +133,7 @@ create_scale_offset_dset_float(hid_t fid, hid_t sid)
      */
     for (j = 0; j < NX; j++) {
 	for (i = 0; i < NY; i++)
-	    data[j][i] = ((float)(i + j + 1))/3;
+	    data[j][i] = ((double)(i + j + 1))/3;
     }
 
     /*
@@ -148,13 +148,13 @@ create_scale_offset_dset_float(hid_t fid, hid_t sid)
      * Create a new dataset within the file using defined dataspace and
      * datatype and default dataset creation properties.
      */
-    dataset = H5Dcreate2(fid, DATASETNAME2, H5T_NATIVE_FLOAT, sid,
+    dataset = H5Dcreate2(fid, DATASETNAME2, H5T_NATIVE_DOUBLE, sid,
 			H5P_DEFAULT, dcpl, H5P_DEFAULT);
 
     /*
      * Write the data to the dataset using default transfer properties.
      */
-    status = H5Dwrite(dataset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL,
+    status = H5Dwrite(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL,
 		      H5P_DEFAULT, data);
 
     /*
@@ -290,8 +290,8 @@ main (void)
     /* Create a regular dataset */
     create_normal_dset(file, dataspace);
 
-    /* Create a dataset of FLOAT with scale-offset filter */
-    create_scale_offset_dset_float(file, dataspace);
+    /* Create a dataset of DOUBLE with scale-offset filter */
+    create_scale_offset_dset_double(file, dataspace);
 
     /* Create a dataset of INT with scale-offset filter */
     create_scale_offset_dset_int(file, dataspace);
diff --git a/test/le_data.h5 b/test/le_data.h5
index 29e21649df..6bb0e4603a 100644
Binary files a/test/le_data.h5 and b/test/le_data.h5 differ
diff --git a/test/vms_data.h5 b/test/vms_data.h5
index 5a45072d46..5f0708204a 100644
Binary files a/test/vms_data.h5 and b/test/vms_data.h5 differ