diff --git a/test/trivial_state.cpp b/test/trivial_state.cpp
new file mode 100644
index 0000000..9976db7
--- /dev/null
+++ b/test/trivial_state.cpp
@@ -0,0 +1,109 @@
+/*
+ [auto_generated]
+ libs/numeric/odeint/test/trivial_state.cpp
+
+ [begin_description]
+ This file tests if the steppers can integrate the trivial state consisting of a single double.
+ [end_description]
+
+ Copyright 2012-2013 Mario Mulansky
+ Copyright 2012 Karsten Ahnert
+
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or
+ copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+
+#include <limits>
+
+// disable checked iterator warning for msvc
+#include <boost/config.hpp>
+#ifdef BOOST_MSVC
+    #pragma warning(disable:4996)
+#endif
+
+#define BOOST_TEST_MODULE odeint_trivial_state
+
+#include <boost/test/unit_test.hpp>
+
+#include <boost/mpl/vector.hpp>
+#include <boost/mpl/int.hpp>
+#include <boost/mpl/at.hpp>
+
+#include <boost/numeric/odeint/stepper/euler.hpp>
+#include <boost/numeric/odeint/stepper/runge_kutta4.hpp>
+#include <boost/numeric/odeint/stepper/runge_kutta_cash_karp54.hpp>
+#include <boost/numeric/odeint/stepper/runge_kutta_dopri5.hpp>
+#include <boost/numeric/odeint/stepper/generation.hpp>
+#include <boost/numeric/odeint/integrate/integrate_adaptive.hpp>
+#include <boost/numeric/odeint/algebra/vector_space_algebra.hpp>
+
+using namespace boost::unit_test;
+using namespace boost::numeric::odeint;
+
+namespace mpl = boost::mpl;
+
+struct constant_system
+{
+    template< typename T >
+    void operator()( const T &x , T &dxdt , const T t ) const
+    { dxdt = 1.0; }
+};
+
+
+BOOST_AUTO_TEST_SUITE( trivial_state_test )
+
+/* test different do_step methods of simple steppers */
+
+typedef mpl::vector<
+        euler< double > ,
+        runge_kutta4< double > ,
+        // with floats all four parameters have to be given explicitly to override default double
+        euler< float , float , float , float > ,
+        runge_kutta4< float , float , float , float >
+        >::type stepper_types;
+
+
+BOOST_AUTO_TEST_CASE_TEMPLATE( test_do_step , T, stepper_types )
+{
+    typedef T stepper_type;
+    stepper_type stepper;
+    typename stepper_type::state_type x = 0.0;
+    typename stepper_type::time_type t = 0.0;
+    typename stepper_type::time_type dt = 0.1;
+    stepper.do_step( constant_system() , x , t , dt );
+    BOOST_CHECK_CLOSE( x , 0.1 , 100*std::numeric_limits< typename stepper_type::state_type >::epsilon() );
+
+    // this overload is not allowed if the types of dxdt and dt are the same
+    // deriv_type dxdt = 1.0;
+    // stepper.do_step( constant_system , x , dxdt , t , dt );
+
+    typename stepper_type::state_type x_out;
+    stepper.do_step( constant_system() , x , t , x_out , dt );
+    BOOST_CHECK_CLOSE( x , 0.1 , 100*std::numeric_limits< typename stepper_type::state_type >::epsilon() );
+    BOOST_CHECK_CLOSE( x_out , 0.2 , 100*std::numeric_limits< typename stepper_type::state_type >::epsilon() );
+}
+
+
+/* test integrate_adaptive with controlled steppers */
+
+typedef mpl::vector<
+    runge_kutta_cash_karp54< double > ,
+    runge_kutta_dopri5< double > ,
+    // with floats all four parameters have to be given explicitly to override default double
+    runge_kutta_cash_karp54< float , float , float , float > ,
+    runge_kutta_dopri5< float , float , float , float >
+    > error_stepper_types;
+
+BOOST_AUTO_TEST_CASE_TEMPLATE( test_integrate , T , error_stepper_types )
+{
+    typedef T stepper_type;
+    typename stepper_type::state_type x = 0.0;
+    typename stepper_type::time_type t0 = 0.0;
+    typename stepper_type::time_type t1 = 1.0;
+    typename stepper_type::time_type dt = 0.1;
+    integrate_adaptive( make_controlled< stepper_type >( 1e-6 , 1e-6 ) , constant_system() , x , t0 , t1 , dt );
+    BOOST_CHECK_CLOSE( x , 1.0 , 100*std::numeric_limits< typename stepper_type::state_type >::epsilon() );
+}
+
+BOOST_AUTO_TEST_SUITE_END()