diff --git a/include/boost/graph/graph_test.hpp b/include/boost/graph/graph_test.hpp
index eb822719..6ccec19b 100644
--- a/include/boost/graph/graph_test.hpp
+++ b/include/boost/graph/graph_test.hpp
@@ -3,12 +3,13 @@
 
 #include <vector>
 #include <boost/test/test_tools.hpp>
-#include <boost/graph/iteration_macros.hpp>
 #include <boost/graph/filtered_graph.hpp>
 #include <boost/graph/isomorphism.hpp>
 #include <boost/graph/copy.hpp>
 #include <boost/graph/graph_utility.hpp> // for connects
 
+#include <boost/graph/iteration_macros.hpp>
+
 // UNDER CONSTRUCTION 
 
 namespace boost {
@@ -321,7 +322,14 @@ namespace boost {
       typedef typename property_map<Graph, PropertyTag>::const_type const_Map;
       const_Map pmap = get(PropertyTag(), g);
       typename std::vector<PropVal>::const_iterator i = vertex_prop.begin();
-      BGL_FORALL_VERTICES_T(v, g, Graph) {
+
+  for (typename boost::graph_traits<Graph>::vertex_iterator 
+           bgl_first_9 = vertices(g).first, bgl_last_9 = vertices(g).second;
+       bgl_first_9 != bgl_last_9; bgl_first_9 = bgl_last_9)
+    for (typename boost::graph_traits<Graph>::vertex_descriptor v;
+         bgl_first_9 != bgl_last ? (v = *bgl_first_9, true) : false;
+         ++bgl_first_9) {
+      //BGL_FORALL_VERTICES_T(v, g, Graph) {
         typename property_traits<const_Map>::value_type 
           pval1 = get(pmap, x), pval2 = get(Property(), g, x);
         BOOST_TEST(pval1 == pval2);
@@ -336,7 +344,13 @@ namespace boost {
       typedef typename property_map<Graph, PropertyTag>::type PMap;
       PMap pmap = get(PropertyTag(), g);
       typename std::vector<PropVal>::const_iterator i = vertex_prop.begin();
-      BGL_FORALL_VERTICES_T(v, g, Graph)
+  for (typename boost::graph_traits<Graph>::vertex_iterator 
+           bgl_first_9 = vertices(g).first, bgl_last_9 = vertices(g).second;
+       bgl_first_9 != bgl_last_9; bgl_first_9 = bgl_last_9)
+    for (typename boost::graph_traits<Graph>::vertex_descriptor v;
+         bgl_first_9 != bgl_last ? (v = *bgl_first_9, true) : false;
+         ++bgl_first_9)
+      //      BGL_FORALL_VERTICES_T(v, g, Graph)
         put(pmap, x, *i++);
 
       test_readable_vertex_property_graph(vertex_prop, tag, g);