diff --git a/tools/test/include/psemek/test/test.hpp b/tools/test/include/psemek/test/test.hpp
index 055b93d5..129c5ad7 100644
--- a/tools/test/include/psemek/test/test.hpp
+++ b/tools/test/include/psemek/test/test.hpp
@@ -5,6 +5,8 @@
 #include <vector>
 #include <optional>
 #include <iostream>
+#include <utility>
+#include <tuple>
 
 // Have to put it before including to_string.hpp due to how unqualified lookup works,
 // see e.g. https://alexanderlobov.net/posts/2019-07-08-function-lookup-in-templates
@@ -18,6 +20,24 @@ std::ostream & operator << (std::ostream & s, std::optional<T> const & o)
 	return s;
 }
 
+template <typename T1, typename T2>
+std::ostream & operator << (std::ostream & s, std::pair<T1, T2> const & p)
+{
+	s << '(' << p.first << ", " << p.second << ')';
+	return s;
+}
+
+template <typename ... Ts>
+std::ostream & operator << (std::ostream & s, std::tuple<Ts...> const & t)
+{
+	s << '(';
+	[&]<std::size_t ... Is>(std::index_sequence<Is...>){
+		((s << (Is == 0 ? "" : ", ") << std::get<Is>(t)), ...);
+	}(std::make_index_sequence<sizeof...(Ts)>{});
+	s << ')';
+	return s;
+}
+
 #include <psemek/util/to_string.hpp>
 
 namespace psemek::test