diff --git a/test/th5o.c b/test/th5o.c
index 70f8067b86..c46751e6ce 100644
--- a/test/th5o.c
+++ b/test/th5o.c
@@ -1351,7 +1351,9 @@ test_h5o(void)
     test_h5o_link();            /* Test object link routine */
     test_h5o_comment();         /* Test routines for comment */
     test_h5o_comment_by_name(); /* Test routines for comment by name */
+#ifndef  H5_CANNOT_OPEN_TWICE   /* OpenVMS can't open a file twice */
     test_h5o_getinfo_same_file(); /* Test info for objects in the same file */
+#endif /* H5_CANNOT_OPEN_TWICE */
 } /* test_h5o() */
 
 
diff --git a/test/th5s.c b/test/th5s.c
index a5ef60535f..e9f8ef42c4 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -935,6 +935,10 @@ test_h5s_zero_dim(void)
         }
     }
 
+    /* Close attribute */
+    ret = H5Aclose(attr);
+    CHECK(ret, FAIL, "H5Aclose");
+
     /*===============================================================
      * Extend the dimension to make it a normal dataspace (3x15x13).  
      * Verify that data can be written to and read from the chunked