diff --git a/tstl/test_suite/algorithms.cpp b/tstl/test_suite/algorithms.cpp
new file mode 100644
index 00000000..a52ffb8d
--- /dev/null
+++ b/tstl/test_suite/algorithms.cpp
@@ -0,0 +1,101 @@
+//=======================================================================
+// Copyright Baptiste Wicht 2013-2016.
+// 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 <cstdio>
+#include <cstring>
+
+#include <type_traits.hpp>
+#include <string.hpp>
+
+#include "test.hpp"
+
+namespace {
+
+void test_fill_n(){
+    char test[25];
+
+    test[0] = 'a';
+    test[3] = 'b';
+    test[20] = 'd';
+    test[24] = 'e';
+
+    std::fill_n(test + 4, 16, 'Z');
+
+    check(test[0] == 'a', "Invalid fill_n");
+    check(test[3] == 'b', "Invalid fill_n");
+    for(size_t i = 4; i < 20; ++i){
+        check(test[i] == 'Z', "Invalid fill_n");
+    }
+    check(test[20] == 'd', "Invalid fill_n");
+    check(test[24] == 'e', "Invalid fill_n");
+}
+
+void test_fill(){
+    char test[25];
+
+    test[0] = 'a';
+    test[3] = 'b';
+    test[20] = 'd';
+    test[24] = 'e';
+
+    std::fill(test + 4, test + 20, 'Z');
+
+    check(test[0] == 'a', "Invalid fill_n");
+    check(test[3] == 'b', "Invalid fill_n");
+    for(size_t i = 4; i < 20; ++i){
+        check(test[i] == 'Z', "Invalid fill_n");
+    }
+    check(test[20] == 'd', "Invalid fill_n");
+    check(test[24] == 'e', "Invalid fill_n");
+}
+
+void test_clear_n(){
+    char test[25];
+
+    test[0] = 'a';
+    test[3] = 'b';
+    test[20] = 'd';
+    test[24] = 'e';
+
+    std::fill_n(test + 4, 16, 0);
+
+    check(test[0] == 'a', "Invalid fill_n");
+    check(test[3] == 'b', "Invalid fill_n");
+    for(size_t i = 4; i < 20; ++i){
+        check(test[i] == 0, "Invalid fill_n");
+    }
+    check(test[20] == 'd', "Invalid fill_n");
+    check(test[24] == 'e', "Invalid fill_n");
+}
+
+void test_clear(){
+    char test[25];
+
+    test[0] = 'a';
+    test[3] = 'b';
+    test[20] = 'd';
+    test[24] = 'e';
+
+    std::fill(test + 4, test + 20, 0);
+
+    check(test[0] == 'a', "Invalid fill_n");
+    check(test[3] == 'b', "Invalid fill_n");
+    for(size_t i = 4; i < 20; ++i){
+        check(test[i] == 0, "Invalid fill_n");
+    }
+    check(test[20] == 'd', "Invalid fill_n");
+    check(test[24] == 'e', "Invalid fill_n");
+}
+
+} //end of anonymous namespace
+
+void algorithms_tests(){
+    test_fill();
+    test_fill_n();
+    test_clear();
+    test_clear_n();
+}
diff --git a/tstl/test_suite/test.cpp b/tstl/test_suite/test.cpp
index 8d4e56e7..c02f89c0 100644
--- a/tstl/test_suite/test.cpp
+++ b/tstl/test_suite/test.cpp
@@ -12,10 +12,12 @@
 
 void string_tests();
 void traits_tests();
+void algorithms_tests();
 
 int main(){
     string_tests();
     traits_tests();
+    algorithms_tests();
 
     printf("All tests finished\n");