diff --git a/ompi/datatype/ompi_datatype.h b/ompi/datatype/ompi_datatype.h
index 26978d0867e..97f87d53bdf 100644
--- a/ompi/datatype/ompi_datatype.h
+++ b/ompi/datatype/ompi_datatype.h
@@ -118,7 +118,6 @@ OMPI_DECLSPEC extern opal_convertor_t* ompi_mpi_local_convertor;
 extern struct opal_pointer_array_t ompi_datatype_f_to_c_table;
 
 OMPI_DECLSPEC int32_t ompi_datatype_init( void );
-OMPI_DECLSPEC int32_t ompi_datatype_finalize( void );
 
 OMPI_DECLSPEC int32_t ompi_datatype_default_convertors_init( void );
 OMPI_DECLSPEC int32_t ompi_datatype_default_convertors_fini( void );
diff --git a/ompi/datatype/ompi_datatype_module.c b/ompi/datatype/ompi_datatype_module.c
index c519d376970..6ab1da0712b 100644
--- a/ompi/datatype/ompi_datatype_module.c
+++ b/ompi/datatype/ompi_datatype_module.c
@@ -43,6 +43,8 @@
 
 #include "mpi.h"
 
+static int ompi_datatype_finalize (void);
+
 /**
  * This is the number of predefined datatypes. It is different than the MAX_PREDEFINED
  * as it include all the optional datatypes (such as MPI_INTEGER?, MPI_REAL?).
@@ -687,7 +689,7 @@ int32_t ompi_datatype_init( void )
 }
 
 
-int ompi_datatype_finalize (void)
+static int ompi_datatype_finalize (void)
 {
     int ret = OMPI_SUCCESS;
 
diff --git a/test/datatype/checksum.c b/test/datatype/checksum.c
index 4c8a60bf915..bda063f9580 100644
--- a/test/datatype/checksum.c
+++ b/test/datatype/checksum.c
@@ -151,7 +151,6 @@ int main(int argc, char *argv[])
     free(packed);
 
     /* clean-ups all data allocations */
-    ompi_datatype_finalize();
     opal_finalize_util();
 
     return 0;
diff --git a/test/datatype/ddt_pack.c b/test/datatype/ddt_pack.c
index 7d0f0461baf..59f88290ab3 100644
--- a/test/datatype/ddt_pack.c
+++ b/test/datatype/ddt_pack.c
@@ -500,7 +500,6 @@ int main(int argc, char *argv[])
     ompi_datatype_destroy(&dup_type);
 
 cleanup:
-    ompi_datatype_finalize();
     opal_finalize_util();
 
     return ret;
diff --git a/test/datatype/ddt_raw.c b/test/datatype/ddt_raw.c
index 0dcc5e13a3b..769580ca0b5 100644
--- a/test/datatype/ddt_raw.c
+++ b/test/datatype/ddt_raw.c
@@ -342,7 +342,6 @@ int main(int argc, char *argv[])
     assert(pdt1 == NULL);
 
     /* clean-ups all data allocations */
-    ompi_datatype_finalize();
     opal_finalize_util();
 
     return OMPI_SUCCESS;
diff --git a/test/datatype/ddt_test.c b/test/datatype/ddt_test.c
index a61019cc4e7..214c47df3f6 100644
--- a/test/datatype/ddt_test.c
+++ b/test/datatype/ddt_test.c
@@ -579,7 +579,7 @@ int main(int argc, char *argv[])
     assert(pdt2 == NULL);
 
     /* clean-ups all data allocations */
-    ompi_datatype_finalize();
+    opal_finalize_util();
 
     return OMPI_SUCCESS;
 }
diff --git a/test/datatype/external32.c b/test/datatype/external32.c
index 397c5b5e21b..b96d000f20e 100644
--- a/test/datatype/external32.c
+++ b/test/datatype/external32.c
@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    ompi_datatype_finalize();
+    opal_finalize_util();
 
     return 0;
 }
diff --git a/test/datatype/partial.c b/test/datatype/partial.c
index bfb1c5d59dc..a4b537aa395 100644
--- a/test/datatype/partial.c
+++ b/test/datatype/partial.c
@@ -173,7 +173,6 @@ int main(int argc, char *argv[])
     free(packed);
 
     /* clean-ups all data allocations */
-    ompi_datatype_finalize();
     opal_finalize_util();
 
     return 0;
diff --git a/test/datatype/position.c b/test/datatype/position.c
index d4ec8ccab57..a4a9f212644 100644
--- a/test/datatype/position.c
+++ b/test/datatype/position.c
@@ -267,7 +267,6 @@ int main(int argc, char *argv[])
     }
     free(segments);
 
-    ompi_datatype_finalize();
     opal_finalize_util();
 
     return (0 == errors ? 0 : -1);
diff --git a/test/datatype/position_noncontig.c b/test/datatype/position_noncontig.c
index 87412c2c773..e700906a6ee 100644
--- a/test/datatype/position_noncontig.c
+++ b/test/datatype/position_noncontig.c
@@ -235,7 +235,6 @@ int main(int argc, char *argv[])
     }
     free(segments);
 
-    ompi_datatype_finalize();
     opal_finalize_util();
 
     return (0 == errors ? 0 : -1);