Index: uspace/app/cpptest/main.cpp
===================================================================
--- uspace/app/cpptest/main.cpp	(revision a57a79cda8ae2a6e9b9e6060a4deaee78e8a1431)
+++ uspace/app/cpptest/main.cpp	(revision a61398529b5d6ed30d0e0fa33922c440d6fedccc)
@@ -1,12 +1,96 @@
-#include <internal/test/tests.hpp>
+#include <__bits/test/tests.hpp>
+
+/* using namespace std::chrono_literals; */
+
+#include <cassert>
+#include <cctype>
+#include <cerrno>
+#include <cinttypes>
+#include <climits>
+#include <csetjmp>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+#include <cwchar>
+
+#include <algorithm>
+#include <array>
+#include <chrono>
+#include <condition_variable>
+#include <deque>
+#include <exception>
+#include <fstream>
+#include <functional>
+#include <initializer_list>
+#include <ios>
+#include <iosfwd>
+#include <iostream>
+#include <istream>
+#include <iterator>
+#include <limits>
+#include <list>
+#include <locale>
+#include <memory>
+#include <mutex>
+#include <new>
+#include <numeric>
+#include <ostream>
+#include <ratio>
+#include <sstream>
+#include <stack>
+#include <streambuf>
+#include <string>
+#include <system_error>
+#include <thread>
+#include <tuple>
+#include <type_traits>
+#include <typeindex>
+#include <typeinfo>
+#include <utility>
+#include <vector>
+#include <unordered_map>
+#include <unordered_set>
+#include <queue>
+#include <set>
+#include <map>
+#include <bitset>
+#include <random>
+#include <iomanip>
+#include <system_error>
+#include <stdexcept>
+#include <complex>
+#include <future>
+
+#include <__bits/hash_table.hpp>
+#include <__bits/rbtree.hpp>
+#include <__bits/builtins.hpp>
+
+#include <__bits/trycatch.hpp>
 
 int main()
 {
-    using namespace std::test;
+    std::test::test_set ts{};
+    ts.add<std::test::vector_test>();
+    ts.add<std::test::string_test>();
+    ts.add<std::test::array_test>();
+    ts.add<std::test::bitset_test>();
+    ts.add<std::test::deque_test>();
+    ts.add<std::test::tuple_test>();
+    ts.add<std::test::map_test>();
+    ts.add<std::test::set_test>();
+    ts.add<std::test::unordered_map_test>();
+    ts.add<std::test::unordered_set_test>();
+    ts.add<std::test::numeric_test>();
+    ts.add<std::test::adaptors_test>();
+    ts.add<std::test::memory_test>();
+    ts.add<std::test::list_test>();
+    ts.add<std::test::ratio_test>();
+    ts.add<std::test::functional_test>();
+    ts.add<std::test::algorithm_test>();
 
-    test_set tests{};
-    tests.add<array_test>();
-    tests.add<string_test>();
-    tests.add<vector_test>();
-    return tests.run() ? 0 : 1;
+    return ts.run(true) ? 0 : 1;
 }