diff --git a/tests/common.hpp b/tests/common.hpp
deleted file mode 100644
index 35e47176e01e5cab7cf1c29126a237c598eb82ba..0000000000000000000000000000000000000000
--- a/tests/common.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef HEADER_TEST_COMMON_HPP
-#define HEADER_TEST_COMMON_HPP
-
-#include "test.hpp"
-
-using namespace pugi;
-
-#endif
diff --git a/tests/helpers.hpp b/tests/helpers.hpp
index 439f8ea2b91d274757af84366d1a3eb43c322d78..6dfdc4b434cda3bb59d893660c6797d473a80b51 100644
--- a/tests/helpers.hpp
+++ b/tests/helpers.hpp
@@ -1,7 +1,7 @@
 #ifndef HEADER_TEST_HELPERS_HPP
 #define HEADER_TEST_HELPERS_HPP
 
-#include "common.hpp"
+#include "test.hpp"
 
 #include <utility>
 
diff --git a/tests/test_compact.cpp b/tests/test_compact.cpp
index f5dc4eeb8f0546a17406d1c670a17d1123c458f5..89bbfaa017d5316e94b8390ff81d3c52db814f19 100644
--- a/tests/test_compact.cpp
+++ b/tests/test_compact.cpp
@@ -1,5 +1,7 @@
 #ifdef PUGIXML_COMPACT
-#include "common.hpp"
+#include "test.hpp"
+
+using namespace pugi;
 
 static void overflow_hash_table(xml_document& doc)
 {
diff --git a/tests/test_deprecated.cpp b/tests/test_deprecated.cpp
index 55f8937ac909572a5b63af53720d1486f491efa9..990e9ba56233ef47ad36078150c4cd1eb9facfb6 100644
--- a/tests/test_deprecated.cpp
+++ b/tests/test_deprecated.cpp
@@ -1,6 +1,8 @@
 #define PUGIXML_DEPRECATED // Suppress deprecated declarations to avoid warnings
 
-#include "common.hpp"
+#include "test.hpp"
+
+using namespace pugi;
 
 TEST(document_deprecated_load)
 {
diff --git a/tests/test_document.cpp b/tests/test_document.cpp
index 45b8536fa19ed5976944cdecf11f14f4134b59e3..2b4c4bebe92499528f5ba066729881358f44ebc2 100644
--- a/tests/test_document.cpp
+++ b/tests/test_document.cpp
@@ -5,7 +5,7 @@
 
 #include <string.h> // because Borland's STL is braindead, we have to include <string.h> _before_ <string> in order to get memcpy
 
-#include "common.hpp"
+#include "test.hpp"
 
 #include "writer_string.hpp"
 
@@ -26,6 +26,8 @@
 #	include <unistd.h> // for unlink
 #endif
 
+using namespace pugi;
+
 static bool load_file_in_memory(const char* path, char*& data, size_t& size)
 {
 	FILE* file = fopen(path, "rb");
diff --git a/tests/test_dom_modify.cpp b/tests/test_dom_modify.cpp
index c863c6fccc406476dcd29c69a98b9bc1859b12bc..96968279ebbca0b0d5a2a929a3603189d546f9d1 100644
--- a/tests/test_dom_modify.cpp
+++ b/tests/test_dom_modify.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include "test.hpp"
 
 #include <limits>
 #include <string>
@@ -7,6 +7,8 @@
 #include <string.h>
 #include <limits.h>
 
+using namespace pugi;
+
 TEST_XML(dom_attr_assign, "<node/>")
 {
 	xml_node node = doc.child(STR("node"));
diff --git a/tests/test_dom_text.cpp b/tests/test_dom_text.cpp
index 8f62e49aaae7971dabad460930799cf5d4a88a2c..23b41e5e31091242226ccef3d9f7c27e63323980 100644
--- a/tests/test_dom_text.cpp
+++ b/tests/test_dom_text.cpp
@@ -1,9 +1,11 @@
-#include "common.hpp"
+#include "test.hpp"
 
 #include "helpers.hpp"
 
 #include <limits.h>
 
+using namespace pugi;
+
 TEST_XML_FLAGS(dom_text_empty, "<node><a>foo</a><b><![CDATA[bar]]></b><c><?pi value?></c><d/></node>", parse_default | parse_pi)
 {
     xml_node node = doc.child(STR("node"));
diff --git a/tests/test_dom_traverse.cpp b/tests/test_dom_traverse.cpp
index 4dc6cda6c8852cd0b341c00295af4d7c345b49b5..b13567419378f8a36bd6e5841ebfc6964c888d80 100644
--- a/tests/test_dom_traverse.cpp
+++ b/tests/test_dom_traverse.cpp
@@ -2,7 +2,7 @@
 #define _SCL_SECURE_NO_WARNINGS
 #define _SCL_SECURE_NO_DEPRECATE
 
-#include "common.hpp"
+#include "test.hpp"
 
 #include <string.h>
 #include <stdio.h>
@@ -15,6 +15,8 @@
 
 #include "helpers.hpp"
 
+using namespace pugi;
+
 #ifdef PUGIXML_NO_STL
 template <typename I> static I move_iter(I base, int n)
 {
diff --git a/tests/test_header_only_1.cpp b/tests/test_header_only_1.cpp
index e33fd783a7dcd8b8241756026ccaffb831e065f6..2e90b3383306ee350c1830e07628ac1cd6f93ffb 100644
--- a/tests/test_header_only_1.cpp
+++ b/tests/test_header_only_1.cpp
@@ -1,12 +1,14 @@
 #define PUGIXML_HEADER_ONLY
 #define pugi pugih
 
-#include "common.hpp"
+#include "test.hpp"
 
 // Check header guards
 #include "../src/pugixml.hpp"
 #include "../src/pugixml.hpp"
 
+using namespace pugi;
+
 TEST(header_only_1)
 {
 	xml_document doc;
diff --git a/tests/test_header_only_2.cpp b/tests/test_header_only_2.cpp
index 220c8077564a3569e68ab3385d28488416ccfb27..e4e876d03f1066007fd0290c82d242bb1bfd45ae 100644
--- a/tests/test_header_only_2.cpp
+++ b/tests/test_header_only_2.cpp
@@ -1,12 +1,14 @@
 #define PUGIXML_HEADER_ONLY
 #define pugi pugih
 
-#include "common.hpp"
+#include "test.hpp"
 
 // Check header guards
 #include "../src/pugixml.hpp"
 #include "../src/pugixml.hpp"
 
+using namespace pugi;
+
 TEST(header_only_2)
 {
 	xml_document doc;
diff --git a/tests/test_memory.cpp b/tests/test_memory.cpp
index becb89b3244cf1b76efc1aea1af6e54a12592fac..4acda5b26a7d0e63a0b55a77af18b48a49a210bc 100644
--- a/tests/test_memory.cpp
+++ b/tests/test_memory.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include "test.hpp"
 
 #include "writer_string.hpp"
 #include "allocator.hpp"
@@ -6,6 +6,8 @@
 #include <string>
 #include <vector>
 
+using namespace pugi;
+
 namespace
 {
 	int page_allocs = 0;
diff --git a/tests/test_parse.cpp b/tests/test_parse.cpp
index a0af591febe13861f757a50d07508d53a93a1574..dd40bc549b5a3a30f29bc7169774f7eab4fb4b55 100644
--- a/tests/test_parse.cpp
+++ b/tests/test_parse.cpp
@@ -1,7 +1,9 @@
-#include "common.hpp"
+#include "test.hpp"
 
 #include "writer_string.hpp"
 
+using namespace pugi;
+
 TEST(parse_pi_skip)
 {
 	xml_document doc;
diff --git a/tests/test_parse_doctype.cpp b/tests/test_parse_doctype.cpp
index e32af8e1a5a14eb31a008ff52c0795482c18e124..861e7726548727137f0f75c07159b1d0f7db24e3 100644
--- a/tests/test_parse_doctype.cpp
+++ b/tests/test_parse_doctype.cpp
@@ -1,11 +1,13 @@
 #define _CRT_SECURE_NO_WARNINGS
 
-#include "common.hpp"
+#include "test.hpp"
 
 #include <string.h>
 #include <wchar.h>
 #include <string>
 
+using namespace pugi;
+
 static xml_parse_result load_concat(xml_document& doc, const char_t* a, const char_t* b = STR(""), const char_t* c = STR(""))
 {
 	char_t buffer[768];
diff --git a/tests/test_unicode.cpp b/tests/test_unicode.cpp
index 1902e3608556f4eddc1363758d29e48182eca16e..4cb61142790c6f5501176953260ed6fd4df2c6d8 100644
--- a/tests/test_unicode.cpp
+++ b/tests/test_unicode.cpp
@@ -1,9 +1,11 @@
 #ifndef PUGIXML_NO_STL
 
-#include "common.hpp"
+#include "test.hpp"
 
 #include <string>
 
+using namespace pugi;
+
 // letters taken from http://www.utf8-chartable.de/
 
 TEST(as_wide_empty)
diff --git a/tests/test_write.cpp b/tests/test_write.cpp
index 5736273570e6649e3a374a0d70a9ccc349fa9427..95cc566a03a095b16b686a6e2dc95ee21fc9ee1a 100644
--- a/tests/test_write.cpp
+++ b/tests/test_write.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include "test.hpp"
 
 #include "writer_string.hpp"
 
@@ -6,6 +6,8 @@
 #include <sstream>
 #include <stdexcept>
 
+using namespace pugi;
+
 TEST_XML(write_simple, "<node attr='1'><child>text</child></node>")
 {
 	CHECK_NODE_EX(doc, STR("<node attr=\"1\">\n<child>text</child>\n</node>\n"), STR(""), 0);
diff --git a/tests/test_xpath.cpp b/tests/test_xpath.cpp
index 24daa4e769da0b51f38acb77cebd3ad59271fd63..19ff25c85d7983dfc56294ad3e5c38bd49f3ff43 100644
--- a/tests/test_xpath.cpp
+++ b/tests/test_xpath.cpp
@@ -1,6 +1,6 @@
 #ifndef PUGIXML_NO_XPATH
 
-#include "common.hpp"
+#include "test.hpp"
 
 #include <string.h>
 #include <wchar.h>
@@ -10,6 +10,8 @@
 #include <algorithm>
 #include <limits>
 
+using namespace pugi;
+
 static void load_document_copy(xml_document& doc, const char_t* text)
 {
 	xml_document source;
diff --git a/tests/test_xpath_api.cpp b/tests/test_xpath_api.cpp
index f933fb858e172325317c2e7fae7f61389a3b4eb9..7abf7d96fa7c600b70f129b9d4eb8c9e2c6430dd 100644
--- a/tests/test_xpath_api.cpp
+++ b/tests/test_xpath_api.cpp
@@ -2,13 +2,15 @@
 
 #include <string.h> // because Borland's STL is braindead, we have to include <string.h> _before_ <string> in order to get memcmp
 
-#include "common.hpp"
+#include "test.hpp"
 
 #include "helpers.hpp"
 
 #include <string>
 #include <vector>
 
+using namespace pugi;
+
 TEST_XML(xpath_api_select_nodes, "<node><head/><foo/><foo/><tail/></node>")
 {
 	xpath_node_set ns1 = doc.select_nodes(STR("node/foo"));
diff --git a/tests/test_xpath_functions.cpp b/tests/test_xpath_functions.cpp
index 604da7837a78adf812696a86ebdce417c6f03861..43e334e20a6b69604f589449a8febc643e0a70cc 100644
--- a/tests/test_xpath_functions.cpp
+++ b/tests/test_xpath_functions.cpp
@@ -1,6 +1,8 @@
 #ifndef PUGIXML_NO_XPATH
 
-#include "common.hpp"
+#include "test.hpp"
+
+using namespace pugi;
 
 TEST_XML(xpath_number_number, "<node>123</node>")
 {
diff --git a/tests/test_xpath_operators.cpp b/tests/test_xpath_operators.cpp
index c2281e6f57ad5251d63d3aca9dc19a5066e63277..5e1316ca48cffa8a7faee8bdeff08e3ef2d2c82b 100644
--- a/tests/test_xpath_operators.cpp
+++ b/tests/test_xpath_operators.cpp
@@ -1,6 +1,8 @@
 #ifndef PUGIXML_NO_XPATH
 
-#include "common.hpp"
+#include "test.hpp"
+
+using namespace pugi;
 
 TEST(xpath_operators_arithmetic)
 {
diff --git a/tests/test_xpath_parse.cpp b/tests/test_xpath_parse.cpp
index 0672c5a5411c5560a5e6247dad5dd4a1bb780e35..daa12bf2f63be6240ebfee6e7069cf878af33445 100644
--- a/tests/test_xpath_parse.cpp
+++ b/tests/test_xpath_parse.cpp
@@ -1,9 +1,11 @@
 #ifndef PUGIXML_NO_XPATH
 
-#include "common.hpp"
+#include "test.hpp"
 
 #include <string>
 
+using namespace pugi;
+
 TEST(xpath_literal_parse)
 {
 	xml_node c;
diff --git a/tests/test_xpath_paths.cpp b/tests/test_xpath_paths.cpp
index dd97019397910d7c96e9746798cbb1c64fe7e44b..54a47ae84828c2e9524b72707d2a37fa73a36cc9 100644
--- a/tests/test_xpath_paths.cpp
+++ b/tests/test_xpath_paths.cpp
@@ -1,6 +1,8 @@
 #ifndef PUGIXML_NO_XPATH
 
-#include "common.hpp"
+#include "test.hpp"
+
+using namespace pugi;
 
 TEST_XML(xpath_paths_axes_child, "<node attr='value'><child attr='value'><subchild/></child><another/><last/></node>")
 {
diff --git a/tests/test_xpath_paths_abbrev_w3c.cpp b/tests/test_xpath_paths_abbrev_w3c.cpp
index af65752456311e62c99cbfc0d6f022e52bb9bb8a..bd01e658305c487bee89b86074e46fe64ab7e123 100644
--- a/tests/test_xpath_paths_abbrev_w3c.cpp
+++ b/tests/test_xpath_paths_abbrev_w3c.cpp
@@ -1,6 +1,8 @@
 #ifndef PUGIXML_NO_XPATH
 
-#include "common.hpp"
+#include "test.hpp"
+
+using namespace pugi;
 
 TEST_XML(xpath_paths_abbrev_w3c_1, "<node><para/><foo/><para/></node>")
 {
diff --git a/tests/test_xpath_paths_w3c.cpp b/tests/test_xpath_paths_w3c.cpp
index 2005bc5ab6e4a7c4d391241dbeb59e487f764f05..1bc21218c025c64205d6d606e38b0121a25373fa 100644
--- a/tests/test_xpath_paths_w3c.cpp
+++ b/tests/test_xpath_paths_w3c.cpp
@@ -1,6 +1,8 @@
 #ifndef PUGIXML_NO_XPATH
 
-#include "common.hpp"
+#include "test.hpp"
+
+using namespace pugi;
 
 TEST_XML(xpath_paths_w3c_1, "<node><para/><foo/><para/></node>")
 {
diff --git a/tests/test_xpath_variables.cpp b/tests/test_xpath_variables.cpp
index 934900453cf9c5fbdb2494b905e73b1bbb6a93aa..d7d7276c990f7318086951dc08765d777a354d42 100644
--- a/tests/test_xpath_variables.cpp
+++ b/tests/test_xpath_variables.cpp
@@ -1,9 +1,11 @@
 #ifndef PUGIXML_NO_XPATH
 
-#include "common.hpp"
+#include "test.hpp"
 
 #include <string>
 
+using namespace pugi;
+
 TEST(xpath_variables_type_none)
 {
 	xpath_variable_set set;
diff --git a/tests/test_xpath_xalan_1.cpp b/tests/test_xpath_xalan_1.cpp
index 7f87c52a25395e208e8613a0a2d36cb260c2b40d..0127ddd7b9db2e81505511a03d5fca9996385534 100644
--- a/tests/test_xpath_xalan_1.cpp
+++ b/tests/test_xpath_xalan_1.cpp
@@ -1,6 +1,8 @@
 #ifndef PUGIXML_NO_XPATH
 
-#include "common.hpp"
+#include "test.hpp"
+
+using namespace pugi;
 
 TEST(xpath_xalan_boolean_1)
 {
diff --git a/tests/test_xpath_xalan_2.cpp b/tests/test_xpath_xalan_2.cpp
index 5edae693113eaa4f02f98ab31be9988626811adb..4e8c10ea49865b161534f864a589f2e9fa38d665 100644
--- a/tests/test_xpath_xalan_2.cpp
+++ b/tests/test_xpath_xalan_2.cpp
@@ -2,11 +2,13 @@
 
 #ifndef PUGIXML_NO_XPATH
 
-#include "common.hpp"
+#include "test.hpp"
 
 #include <string>
 #include <algorithm>
 
+using namespace pugi;
+
 TEST_XML(xpath_xalan_string_1, "<doc a='test'>ENCYCLOPEDIA</doc>")
 {
 	xml_node c;
diff --git a/tests/test_xpath_xalan_3.cpp b/tests/test_xpath_xalan_3.cpp
index d2df3e5b99380c19ef89a908b197854cade4fc34..5228cde18324fbf86df20586f5ed41404d2b2e00 100644
--- a/tests/test_xpath_xalan_3.cpp
+++ b/tests/test_xpath_xalan_3.cpp
@@ -1,6 +1,8 @@
 #ifndef PUGIXML_NO_XPATH
 
-#include "common.hpp"
+#include "test.hpp"
+
+using namespace pugi;
 
 TEST_XML(xpath_xalan_axes_1, "<far-north><north-north-west1/><north-north-west2/><north><near-north><far-west/><west/><near-west/><center center-attr-1='c1' center-attr-2='c2' center-attr-3='c3'><near-south-west/><near-south><south><far-south/></south></near-south><near-south-east/></center><near-east/><east/><far-east/></near-north></north><north-north-east1/><north-north-east2/></far-north>")
 {
diff --git a/tests/test_xpath_xalan_4.cpp b/tests/test_xpath_xalan_4.cpp
index c71eaf7edd7f99ad40797925f36b9f43f99c59a5..997ffb491f5ea332ee549f52be497d0e24c3a001 100644
--- a/tests/test_xpath_xalan_4.cpp
+++ b/tests/test_xpath_xalan_4.cpp
@@ -1,6 +1,8 @@
 #ifndef PUGIXML_NO_XPATH
 
-#include "common.hpp"
+#include "test.hpp"
+
+using namespace pugi;
 
 TEST_XML(xpath_xalan_position_1, "<doc><a>1</a><a>2</a><a>3</a><a>4</a></doc>")
 {
diff --git a/tests/test_xpath_xalan_5.cpp b/tests/test_xpath_xalan_5.cpp
index e6a4fb93ec27b4fa4d731c6a9351e8b6a333adb1..6daa234d2072efdf9c7837e866010253e4804af1 100644
--- a/tests/test_xpath_xalan_5.cpp
+++ b/tests/test_xpath_xalan_5.cpp
@@ -1,6 +1,8 @@
 #ifndef PUGIXML_NO_XPATH
 
-#include "common.hpp"
+#include "test.hpp"
+
+using namespace pugi;
 
 TEST_XML(xpath_xalan_select_1, "<doc><a><b attr='test'/></a><c><d><e/></d></c></doc>")
 {