diff --git a/test/access.cpp b/test/access.cpp
index 30193ae..1b2881b 100644
--- a/test/access.cpp
+++ b/test/access.cpp
@@ -45,6 +45,6 @@ void access(Array& A, const const_array_tag&) {
   ++tests_run;
 }
 
-int test_main(int,char**) {
+int test_main(int,char*[]) {
   return run_generative_tests();
 }
diff --git a/test/assign.cpp b/test/assign.cpp
index 683c733..7b94f71 100644
--- a/test/assign.cpp
+++ b/test/assign.cpp
@@ -56,6 +56,6 @@ void access(Array&, const const_array_tag&) {
 }
 
 
-int test_main(int,char**) {
+int test_main(int,char*[]) {
   return run_generative_tests();
 }
diff --git a/test/concept_checks.cpp b/test/concept_checks.cpp
index 8c27414..8948993 100644
--- a/test/concept_checks.cpp
+++ b/test/concept_checks.cpp
@@ -13,7 +13,7 @@
 #include "boost/array.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array<int,ndims> array;
diff --git a/test/fail_cbracket.cpp b/test/fail_cbracket.cpp
index f867d2b..e9d2828 100644
--- a/test/fail_cbracket.cpp
+++ b/test/fail_cbracket.cpp
@@ -11,7 +11,7 @@
 #include "boost/array.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array<int,ndims> array;
diff --git a/test/fail_cdata.cpp b/test/fail_cdata.cpp
index ca627c4..1e2d2d6 100644
--- a/test/fail_cdata.cpp
+++ b/test/fail_cdata.cpp
@@ -11,7 +11,7 @@
 #include "boost/array.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array<int,ndims> array;
diff --git a/test/fail_citerator.cpp b/test/fail_citerator.cpp
index 959419f..1b83c83 100644
--- a/test/fail_citerator.cpp
+++ b/test/fail_citerator.cpp
@@ -9,7 +9,7 @@
 #include "boost/test/test_tools.hpp"
 
 
-int test_main(int,char**) {
+int test_main(int,char*[]) {
   typedef boost::multi_array<int,3> array;
 
   typedef array::iterator iterator1;
diff --git a/test/fail_cparen.cpp b/test/fail_cparen.cpp
index b3922d5..6afacb7 100644
--- a/test/fail_cparen.cpp
+++ b/test/fail_cparen.cpp
@@ -11,7 +11,7 @@
 #include "boost/array.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array<int,ndims> array;
diff --git a/test/fail_criterator.cpp b/test/fail_criterator.cpp
index 9cc9b63..668e20c 100644
--- a/test/fail_criterator.cpp
+++ b/test/fail_criterator.cpp
@@ -9,7 +9,7 @@
 #include "boost/test/test_tools.hpp"
 
 
-int test_main(int,char**) {
+int test_main(int,char*[]) {
     typedef boost::multi_array<int,3> array;
 
     typedef array::reverse_iterator riterator1;
diff --git a/test/fail_csubarray.cpp b/test/fail_csubarray.cpp
index 58580fc..8a247d7 100644
--- a/test/fail_csubarray.cpp
+++ b/test/fail_csubarray.cpp
@@ -11,7 +11,7 @@
 #include "boost/array.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array<int,ndims> array;
diff --git a/test/fail_csubarray2.cpp b/test/fail_csubarray2.cpp
index 4de1d63..8871820 100644
--- a/test/fail_csubarray2.cpp
+++ b/test/fail_csubarray2.cpp
@@ -11,7 +11,7 @@
 #include "boost/array.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array<int,ndims> array;
diff --git a/test/fail_csubarray3.cpp b/test/fail_csubarray3.cpp
index 734ebe6..4311061 100644
--- a/test/fail_csubarray3.cpp
+++ b/test/fail_csubarray3.cpp
@@ -11,7 +11,7 @@
 #include "boost/array.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array<int,ndims> array;
diff --git a/test/fail_cview.cpp b/test/fail_cview.cpp
index 1976001..1955c6c 100644
--- a/test/fail_cview.cpp
+++ b/test/fail_cview.cpp
@@ -12,7 +12,7 @@
 #include "boost/type.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array<int,ndims> array;
diff --git a/test/fail_cview2.cpp b/test/fail_cview2.cpp
index 27531cb..14cd10f 100644
--- a/test/fail_cview2.cpp
+++ b/test/fail_cview2.cpp
@@ -12,7 +12,7 @@
 #include "boost/type.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array<int,ndims> array;
diff --git a/test/fail_cview3.cpp b/test/fail_cview3.cpp
index bcc33bc..86c2167 100644
--- a/test/fail_cview3.cpp
+++ b/test/fail_cview3.cpp
@@ -12,7 +12,7 @@
 #include "boost/type.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array<int,ndims> array;
diff --git a/test/fail_ref_cbracket.cpp b/test/fail_ref_cbracket.cpp
index 5a0473f..f5ffecf 100644
--- a/test/fail_ref_cbracket.cpp
+++ b/test/fail_ref_cbracket.cpp
@@ -11,7 +11,7 @@
 #include "boost/array.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array_ref<int,ndims> array_ref;
diff --git a/test/fail_ref_cdata.cpp b/test/fail_ref_cdata.cpp
index 41c646d..b737a20 100644
--- a/test/fail_ref_cdata.cpp
+++ b/test/fail_ref_cdata.cpp
@@ -11,7 +11,7 @@
 #include "boost/array.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array_ref<int,ndims> array_ref;
diff --git a/test/fail_ref_citerator.cpp b/test/fail_ref_citerator.cpp
index 472162b..1f12a2b 100644
--- a/test/fail_ref_citerator.cpp
+++ b/test/fail_ref_citerator.cpp
@@ -9,7 +9,7 @@
 #include "boost/test/test_tools.hpp"
 
 
-int test_main(int,char**) {
+int test_main(int,char*[]) {
   typedef boost::multi_array_ref<int,3> array_ref;
 
   typedef array_ref::iterator iterator1;
diff --git a/test/fail_ref_cparen.cpp b/test/fail_ref_cparen.cpp
index 2505acd..5d73d52 100644
--- a/test/fail_ref_cparen.cpp
+++ b/test/fail_ref_cparen.cpp
@@ -11,7 +11,7 @@
 #include "boost/array.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array_ref<int,ndims> array_ref;
diff --git a/test/fail_ref_criterator.cpp b/test/fail_ref_criterator.cpp
index 7e0eeed..1b3a56c 100644
--- a/test/fail_ref_criterator.cpp
+++ b/test/fail_ref_criterator.cpp
@@ -9,7 +9,7 @@
 #include "boost/test/test_tools.hpp"
 
 
-int test_main(int,char**) {
+int test_main(int,char*[]) {
     typedef boost::multi_array_ref<int,3> array_ref;
 
     typedef array_ref::reverse_iterator riterator1;
diff --git a/test/fail_ref_csubarray.cpp b/test/fail_ref_csubarray.cpp
index f3b8e18..7a73aba 100644
--- a/test/fail_ref_csubarray.cpp
+++ b/test/fail_ref_csubarray.cpp
@@ -11,7 +11,7 @@
 #include "boost/array.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array_ref<int,ndims> array_ref;
diff --git a/test/fail_ref_csubarray2.cpp b/test/fail_ref_csubarray2.cpp
index 46d5aeb..5d2d6ec 100644
--- a/test/fail_ref_csubarray2.cpp
+++ b/test/fail_ref_csubarray2.cpp
@@ -11,7 +11,7 @@
 #include "boost/array.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array_ref<int,ndims> array_ref;
diff --git a/test/fail_ref_csubarray3.cpp b/test/fail_ref_csubarray3.cpp
index 3ae3a80..a65354c 100644
--- a/test/fail_ref_csubarray3.cpp
+++ b/test/fail_ref_csubarray3.cpp
@@ -11,7 +11,7 @@
 #include "boost/array.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array_ref<int,ndims> array_ref;
diff --git a/test/fail_ref_cview.cpp b/test/fail_ref_cview.cpp
index 5475091..cad5f98 100644
--- a/test/fail_ref_cview.cpp
+++ b/test/fail_ref_cview.cpp
@@ -12,7 +12,7 @@
 #include "boost/type.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array_ref<int,ndims> array_ref;
diff --git a/test/fail_ref_cview2.cpp b/test/fail_ref_cview2.cpp
index 9c20e0a..fd49b31 100644
--- a/test/fail_ref_cview2.cpp
+++ b/test/fail_ref_cview2.cpp
@@ -12,7 +12,7 @@
 #include "boost/type.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array_ref<int,ndims> array_ref;
diff --git a/test/fail_ref_cview3.cpp b/test/fail_ref_cview3.cpp
index 1b59b6d..808b20e 100644
--- a/test/fail_ref_cview3.cpp
+++ b/test/fail_ref_cview3.cpp
@@ -12,7 +12,7 @@
 #include "boost/type.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array_ref<int,ndims> array_ref;
diff --git a/test/generative_tests.hpp b/test/generative_tests.hpp
index 30ca09e..600ae45 100644
--- a/test/generative_tests.hpp
+++ b/test/generative_tests.hpp
@@ -31,7 +31,7 @@
 //  Since generative-tests uses the Boost.Test framework, you must
 //  define at least the following:
 //
-//  int test_main(int,char**) { return run_generative_tests(); }
+//  int test_main(int,char*[]) { return run_generative_tests(); }
 //
 #include "boost/multi_array.hpp"
 
diff --git a/test/idxgen1.cpp b/test/idxgen1.cpp
index bbe0109..80e7a71 100644
--- a/test/idxgen1.cpp
+++ b/test/idxgen1.cpp
@@ -27,7 +27,7 @@ bool operator==(const boost::detail::multi_array::
 }
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   typedef boost::detail::multi_array::index_range<int,std::size_t> range;
 
diff --git a/test/index_bases.cpp b/test/index_bases.cpp
index a7f7d28..e717aa0 100644
--- a/test/index_bases.cpp
+++ b/test/index_bases.cpp
@@ -11,7 +11,7 @@
 #include <vector>
 #include <iostream>
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   typedef boost::multi_array<double, 3> array;
   typedef boost::multi_array_ref<double, 3> array_ref;
diff --git a/test/range1.cpp b/test/range1.cpp
index a9fdfd3..4946d47 100644
--- a/test/range1.cpp
+++ b/test/range1.cpp
@@ -12,7 +12,7 @@
 #include <cstddef>
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   typedef boost::detail::multi_array::index_range<int,std::size_t> range;
 
diff --git a/test/reshape.cpp b/test/reshape.cpp
index ef5b4e9..cd22afb 100644
--- a/test/reshape.cpp
+++ b/test/reshape.cpp
@@ -11,7 +11,7 @@
 #include "boost/type.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   typedef boost::multi_array<int,ndims> array;
diff --git a/test/slice.cpp b/test/slice.cpp
index ce593ac..13dcf9f 100644
--- a/test/slice.cpp
+++ b/test/slice.cpp
@@ -137,6 +137,6 @@ void access(Array& A, const const_array_tag&) {
 }
 
 
-int test_main(int,char**) {
+int test_main(int,char*[]) {
   return run_generative_tests();
 }
diff --git a/test/storage_order.cpp b/test/storage_order.cpp
index 774a176..74b9fb4 100644
--- a/test/storage_order.cpp
+++ b/test/storage_order.cpp
@@ -10,7 +10,7 @@
 #include "boost/array.hpp"
 
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   const int ndims=3;
   
diff --git a/test/storage_order_convert.cpp b/test/storage_order_convert.cpp
index 9c7df57..ba08dcf 100644
--- a/test/storage_order_convert.cpp
+++ b/test/storage_order_convert.cpp
@@ -8,7 +8,7 @@
 #include "boost/multi_array/storage_order.hpp"
 
 int 
-test_main(int,char**) {
+test_main(int,char*[]) {
 
   using namespace boost;
 
diff --git a/test/vc_death.cpp b/test/vc_death.cpp
index 33502dc..23698b0 100644
--- a/test/vc_death.cpp
+++ b/test/vc_death.cpp
@@ -11,7 +11,7 @@
 #include <vector>
 #include <iostream>
 int
-test_main(int,char**)
+test_main(int,char*[])
 {
   typedef boost::multi_array<double, 3> array;
   typedef array::array_view<3>::type array_view;