diff --git a/test/test_exception.cpp b/test/test_exception.cpp
new file mode 100644
index 00000000..d6361e7f
--- /dev/null
+++ b/test/test_exception.cpp
@@ -0,0 +1,59 @@
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+
+Copyright(c) 2014 jwellbelove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+******************************************************************************/
+
+#include <UnitTest++/UnitTest++.h>
+#include <string>
+
+#include "../exception.h"
+
+namespace 
+{		
+  SUITE(TestException)
+  {
+    //*************************************************************************
+    TEST(Constructor)
+    {
+      etl::exception e("An exception");
+
+      CHECK_EQUAL(std::string("An exception"), std::string(e.what()));
+    }
+
+    //*************************************************************************
+    TEST(Exception)
+    {
+      etl::exception e("An exception");
+
+      try
+      {
+        throw e;
+      }
+      catch (etl::exception& c)
+      {
+        CHECK_EQUAL(std::string("An exception"), std::string(c.what()));
+      }     
+    }
+  };
+}
\ No newline at end of file