diff --git a/tests/DataStructures/Container/TestBucket.cpp b/tests/DataStructures/Container/TestBucket.cpp
index f71cbd4d..8bb3222e 100644
--- a/tests/DataStructures/Container/TestBucket.cpp
+++ b/tests/DataStructures/Container/TestBucket.cpp
@@ -1068,11 +1068,9 @@ TEST_F  ( TestBucketWithMultipleInteger
         std::vector<TElement> optima = bucket_.Optima();
         ASSERT_EQ ( 3, optima.size() );
 
-        for ( Types::count counter = 0
-            ; counter < optima.size()
-            ; ++counter )
+        for ( auto const & optimum : optima )
         {
-            ASSERT_EQ ( optima[counter], 1 );
+            ASSERT_EQ ( optimum, 1 );
         }
     }
 ///@}