diff --git a/src/Compression/tests/compressed_buffer.cpp b/src/Compression/tests/compressed_buffer.cpp
index 346a4068a6c6d23389b671cc06d8167e0c0511c7..89bfe0d0cce6c5eba4a1e8f11c26e89ce9fcc4f9 100644
--- a/src/Compression/tests/compressed_buffer.cpp
+++ b/src/Compression/tests/compressed_buffer.cpp
@@ -1,11 +1,9 @@
 #include <string>
 
 #include <iostream>
-#include <sstream>
 #include <fstream>
 #include <iomanip>
 
-#include <Core/Types.h>
 #include <Common/Stopwatch.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadBufferFromFile.h>
diff --git a/src/Compression/tests/gtest_compressionCodec.cpp b/src/Compression/tests/gtest_compressionCodec.cpp
index edcb6050abb34a6e235a7297b7d6d62923520ad9..b9c7a76934582877dc3b6026b61a83b7f2d0eb1d 100644
--- a/src/Compression/tests/gtest_compressionCodec.cpp
+++ b/src/Compression/tests/gtest_compressionCodec.cpp
@@ -11,8 +11,6 @@
 #include <Parsers/IParser.h>
 #include <Parsers/TokenIterator.h>
 
-#include <fmt/format.h>
-
 #include <random>
 #include <bitset>
 #include <cmath>
diff --git a/src/Core/tests/field.cpp b/src/Core/tests/field.cpp
index 6198288b5076a46a6d8b91ee90aaa61150fb4e12..b0a1c1151a682b1a69d404bb9125ea24f49a08e5 100644
--- a/src/Core/tests/field.cpp
+++ b/src/Core/tests/field.cpp
@@ -1,12 +1,10 @@
 #include <iostream>
 #include <iomanip>
-#include <sstream>
 
 #include <Core/Field.h>
 #include <Common/FieldVisitors.h>
 
 #include <Common/Stopwatch.h>
-#include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/ReadHelpers.h>
 #include <DataTypes/DataTypeString.h>
 
diff --git a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
index ae9c5385b8dbb7f13db8e255765648e0652b7add..fc99a34cd42df7508de010ad326a46f4c453a5c3 100644
--- a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
+++ b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
@@ -1,16 +1,8 @@
-#include <iostream>
-
-#include <sstream>
 #include <Core/Types.h>
 #include <Poco/Util/XMLConfiguration.h>
 #include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTDropQuery.h>
 #include <Parsers/DumpASTNode.h>
 #include <Parsers/ParserCreateQuery.h>
-#include <Parsers/ParserDictionary.h>
-#include <Parsers/ParserDropQuery.h>
-#include <Parsers/ParserTablePropertiesQuery.h>
-#include <Parsers/TablePropertiesQueriesASTs.h>
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
 #include <Dictionaries/getDictionaryConfigurationFromAST.h>
diff --git a/src/Formats/tests/tab_separated_streams.cpp b/src/Formats/tests/tab_separated_streams.cpp
index 4071e4535029292ffce8df3236c77975f11ad3e7..e39c7b6c920b9c366c87c940ef9e2f6e5615f59b 100644
--- a/src/Formats/tests/tab_separated_streams.cpp
+++ b/src/Formats/tests/tab_separated_streams.cpp
@@ -1,7 +1,6 @@
 #include <string>
 
 #include <iostream>
-#include <fstream>
 
 #include <IO/ReadBufferFromFile.h>
 #include <IO/WriteBufferFromFile.h>
diff --git a/src/Functions/tests/CMakeLists.txt b/src/Functions/tests/CMakeLists.txt
index 8bda094076fc459d7e39c5f33bee3640503d055b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/src/Functions/tests/CMakeLists.txt
+++ b/src/Functions/tests/CMakeLists.txt
@@ -1,4 +0,0 @@
-add_executable (number_traits number_traits.cpp)
-#add_executable (abtesting abtesting.cpp)
-target_link_libraries (number_traits PRIVATE dbms)
-#target_link_libraries (abtesting PRIVATE clickhouse_functions)
diff --git a/src/Functions/tests/gtest_abtesting.cpp b/src/Functions/tests/gtest_abtesting.cpp
index 1b2ec8292dc5af1bcc98315265d582800f824d57..d6370129e8a91b1c9d6779ecbdec56bbe49ca7cb 100644
--- a/src/Functions/tests/gtest_abtesting.cpp
+++ b/src/Functions/tests/gtest_abtesting.cpp
@@ -62,59 +62,38 @@ Variants test_bayesab(std::string dist, PODArray<Float64> xs, PODArray<Float64>
     return variants;
 }
 
-TEST(BayesAB, test_1)
+
+TEST(BayesAB, beta)
 {
     size_t max = 0, min = 0;
-    auto variants = test_bayesab("beta", {10000, 1000, 900}, {600, 110, 90}, max, min);
 
+    auto variants = test_bayesab("beta", {10000, 1000, 900}, {600, 110, 90}, max, min);
     ASSERT_EQ(1, max);
-}
 
-TEST(BayesAB, test_2)
-{
-    size_t max = 0, min = 0;
-    auto variants = test_bayesab("beta", {3000, 3000, 3000}, {600, 100, 90}, max, min);
+    variants = test_bayesab("beta", {3000, 3000, 3000}, {600, 100, 90}, max, min);
     ASSERT_EQ(0, max);
-}
 
-TEST(BayesAB, test_3)
-{
-    size_t max = 0, min = 0;
-    auto variants = test_bayesab("beta", {3000, 3000, 3000}, {100, 90, 110}, max, min);
+    variants = test_bayesab("beta", {3000, 3000, 3000}, {100, 90, 110}, max, min);
     ASSERT_EQ(2, max);
-}
 
-TEST(BayesAB, test_4)
-{
-    size_t max = 0, min = 0;
-    auto variants = test_bayesab("beta", {3000, 3000, 3000}, {110, 90, 100}, max, min);
+    variants = test_bayesab("beta", {3000, 3000, 3000}, {110, 90, 100}, max, min);
     ASSERT_EQ(0, max);
 }
+
     
-TEST(BayesAB, test_5)
+TEST(BayesAB, gamma)
 {
     size_t max = 0, min = 0;
     auto variants = test_bayesab("gamma", {10000, 1000, 900}, {600, 110, 90}, max, min);
     ASSERT_EQ(1, max);
-}
-   
-TEST(BayesAB, test_6)
-{
-    size_t max = 0, min = 0;
-    auto variants = test_bayesab("gamma", {3000, 3000, 3000}, {600, 100, 90}, max, min);
+
+    variants = test_bayesab("gamma", {3000, 3000, 3000}, {600, 100, 90}, max, min);
     ASSERT_EQ(0, max);
-}
-   
-TEST(BayesAB, test_7)
-{
-    size_t max = 0, min = 0;
-    auto variants = test_bayesab("gamma", {3000, 3000, 3000}, {100, 90, 110}, max, min);
+
+    variants = test_bayesab("gamma", {3000, 3000, 3000}, {100, 90, 110}, max, min);
     ASSERT_EQ(2, max);
-}
 
-TEST(BayesAB, test_8)
-{
-    size_t max = 0, min = 0;
-    auto variants = test_bayesab("gamma", {3000, 3000, 3000}, {110, 90, 100}, max, min);
+    variants = test_bayesab("gamma", {3000, 3000, 3000}, {110, 90, 100}, max, min);
     ASSERT_EQ(0, max);
 }
+
diff --git a/src/Functions/tests/gtest_number_traits.cpp b/src/Functions/tests/gtest_number_traits.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7199b269190cc5934633766b0fb1ac62f441cbb4
--- /dev/null
+++ b/src/Functions/tests/gtest_number_traits.cpp
@@ -0,0 +1,201 @@
+#include <gtest/gtest.h>
+
+#include <iostream>
+#include <map>
+
+#include <DataTypes/NumberTraits.h>
+
+static const std::map<std::pair<std::string, std::string>, std::string> answer =
+{
+    {{"UInt8", "UInt8"}, "UInt8"},
+    {{"UInt8", "UInt16"}, "UInt16"},
+    {{"UInt8", "UInt32"}, "UInt32"},
+    {{"UInt8", "UInt64"}, "UInt64"},
+    {{"UInt8", "Int8"}, "Int16"},
+    {{"UInt8", "Int16"}, "Int16"},
+    {{"UInt8", "Int32"}, "Int32"},
+    {{"UInt8", "Int64"}, "Int64"},
+    {{"UInt8", "Float32"}, "Float32"},
+    {{"UInt8", "Float64"}, "Float64"},
+    {{"UInt16", "UInt8"}, "UInt16"},
+    {{"UInt16", "UInt16"}, "UInt16"},
+    {{"UInt16", "UInt32"}, "UInt32"},
+    {{"UInt16", "UInt64"}, "UInt64"},
+    {{"UInt16", "Int8"}, "Int32"},
+    {{"UInt16", "Int16"}, "Int32"},
+    {{"UInt16", "Int32"}, "Int32"},
+    {{"UInt16", "Int64"}, "Int64"},
+    {{"UInt16", "Float32"}, "Float32"},
+    {{"UInt16", "Float64"}, "Float64"},
+    {{"UInt32", "UInt8"}, "UInt32"},
+    {{"UInt32", "UInt16"}, "UInt32"},
+    {{"UInt32", "UInt32"}, "UInt32"},
+    {{"UInt32", "UInt64"}, "UInt64"},
+    {{"UInt32", "Int8"}, "Int64"},
+    {{"UInt32", "Int16"}, "Int64"},
+    {{"UInt32", "Int32"}, "Int64"},
+    {{"UInt32", "Int64"}, "Int64"},
+    {{"UInt32", "Float32"}, "Float64"},
+    {{"UInt32", "Float64"}, "Float64"},
+    {{"UInt64", "UInt8"}, "UInt64"},
+    {{"UInt64", "UInt16"}, "UInt64"},
+    {{"UInt64", "UInt32"}, "UInt64"},
+    {{"UInt64", "UInt64"}, "UInt64"},
+    {{"UInt64", "Int8"}, "Error"},
+    {{"UInt64", "Int16"}, "Error"},
+    {{"UInt64", "Int32"}, "Error"},
+    {{"UInt64", "Int64"}, "Error"},
+    {{"UInt64", "Float32"}, "Error"},
+    {{"UInt64", "Float64"}, "Error"},
+    {{"Int8", "UInt8"}, "Int16"},
+    {{"Int8", "UInt16"}, "Int32"},
+    {{"Int8", "UInt32"}, "Int64"},
+    {{"Int8", "UInt64"}, "Error"},
+    {{"Int8", "Int8"}, "Int8"},
+    {{"Int8", "Int16"}, "Int16"},
+    {{"Int8", "Int32"}, "Int32"},
+    {{"Int8", "Int64"}, "Int64"},
+    {{"Int8", "Float32"}, "Float32"},
+    {{"Int8", "Float64"}, "Float64"},
+    {{"Int16", "UInt8"}, "Int16"},
+    {{"Int16", "UInt16"}, "Int32"},
+    {{"Int16", "UInt32"}, "Int64"},
+    {{"Int16", "UInt64"}, "Error"},
+    {{"Int16", "Int8"}, "Int16"},
+    {{"Int16", "Int16"}, "Int16"},
+    {{"Int16", "Int32"}, "Int32"},
+    {{"Int16", "Int64"}, "Int64"},
+    {{"Int16", "Float32"}, "Float32"},
+    {{"Int16", "Float64"}, "Float64"},
+    {{"Int32", "UInt8"}, "Int32"},
+    {{"Int32", "UInt16"}, "Int32"},
+    {{"Int32", "UInt32"}, "Int64"},
+    {{"Int32", "UInt64"}, "Error"},
+    {{"Int32", "Int8"}, "Int32"},
+    {{"Int32", "Int16"}, "Int32"},
+    {{"Int32", "Int32"}, "Int32"},
+    {{"Int32", "Int64"}, "Int64"},
+    {{"Int32", "Float32"}, "Float64"},
+    {{"Int32", "Float64"}, "Float64"},
+    {{"Int64", "UInt8"}, "Int64"},
+    {{"Int64", "UInt16"}, "Int64"},
+    {{"Int64", "UInt32"}, "Int64"},
+    {{"Int64", "UInt64"}, "Error"},
+    {{"Int64", "Int8"}, "Int64"},
+    {{"Int64", "Int16"}, "Int64"},
+    {{"Int64", "Int32"}, "Int64"},
+    {{"Int64", "Int64"}, "Int64"},
+    {{"Int64", "Float32"}, "Error"},
+    {{"Int64", "Float64"}, "Error"},
+    {{"Float32", "UInt8"}, "Float32"},
+    {{"Float32", "UInt16"}, "Float32"},
+    {{"Float32", "UInt32"}, "Float64"},
+    {{"Float32", "UInt64"}, "Error"},
+    {{"Float32", "Int8"}, "Float32"},
+    {{"Float32", "Int16"}, "Float32"},
+    {{"Float32", "Int32"}, "Float64"},
+    {{"Float32", "Int64"}, "Error"},
+    {{"Float32", "Float32"}, "Float32"},
+    {{"Float32", "Float64"}, "Float64"},
+    {{"Float64", "UInt8"}, "Float64"},
+    {{"Float64", "UInt16"}, "Float64"},
+    {{"Float64", "UInt32"}, "Float64"},
+    {{"Float64", "UInt64"}, "Error"},
+    {{"Float64", "Int8"}, "Float64"},
+    {{"Float64", "Int16"}, "Float64"},
+    {{"Float64", "Int32"}, "Float64"},
+    {{"Float64", "Int64"}, "Error"},
+    {{"Float64", "Float32"}, "Float64"},
+    {{"Float64", "Float64"}, "Float64"}
+};
+
+static std::string getTypeString(DB::UInt8) { return "UInt8"; }
+static std::string getTypeString(DB::UInt16) { return "UInt16"; }
+static std::string getTypeString(DB::UInt32) { return "UInt32"; }
+static std::string getTypeString(DB::UInt64) { return "UInt64"; }
+static std::string getTypeString(DB::Int8) { return "Int8"; }
+static std::string getTypeString(DB::Int16) { return "Int16"; }
+static std::string getTypeString(DB::Int32) { return "Int32"; }
+static std::string getTypeString(DB::Int64) { return "Int64"; }
+static std::string getTypeString(DB::Float32) { return "Float32"; }
+static std::string getTypeString(DB::Float64) { return "Float64"; }
+static std::string getTypeString(DB::NumberTraits::Error) { return "Error"; }
+
+template <typename T0, typename T1>
+[[maybe_unused]] void printTypes()
+{
+    std::cout << "{{\"";
+    std::cout << getTypeString(T0());
+    std::cout << "\", \"";
+    std::cout << getTypeString(T1());
+    std::cout << "\"}, \"";
+    std::cout << getTypeString(typename DB::NumberTraits::ResultOfIf<T0, T1>::Type());
+    std::cout << "\"},"<< std::endl;
+}
+
+template <typename T0, typename T1>
+void ifRightType()
+{
+    auto desired = getTypeString(typename DB::NumberTraits::ResultOfIf<T0, T1>::Type());
+    auto left = getTypeString(T0());
+    auto right = getTypeString(T1());
+    auto expected = answer.find({left, right});
+    ASSERT_TRUE(expected != answer.end());
+    ASSERT_EQ(expected->second, desired);
+}
+
+template <typename T0>
+void ifLeftType()
+{
+    ifRightType<T0, DB::UInt8>();
+    ifRightType<T0, DB::UInt16>();
+    ifRightType<T0, DB::UInt32>();
+    ifRightType<T0, DB::UInt64>();
+    ifRightType<T0, DB::Int8>();
+    ifRightType<T0, DB::Int16>();
+    ifRightType<T0, DB::Int32>();
+    ifRightType<T0, DB::Int64>();
+    ifRightType<T0, DB::Float32>();
+    ifRightType<T0, DB::Float64>();
+}
+
+
+TEST(NumberTraits, ResultOfAdditionMultiplication)
+{
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfAdditionMultiplication<DB::UInt8, DB::UInt8>::Type()), "UInt16");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfAdditionMultiplication<DB::UInt8, DB::Int32>::Type()), "Int64");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfAdditionMultiplication<DB::UInt8, DB::Float32>::Type()), "Float64");
+}
+
+
+TEST(NumberTraits, ResultOfSubtraction)
+{
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfSubtraction<DB::UInt8, DB::UInt8>::Type()), "Int16");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfSubtraction<DB::UInt16, DB::UInt8>::Type()), "Int32");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfSubtraction<DB::UInt16, DB::Int8>::Type()), "Int32");
+}
+
+
+TEST(NumberTraits, Others)
+{
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfFloatingPointDivision<DB::UInt16, DB::Int16>::Type()), "Float64");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfFloatingPointDivision<DB::UInt32, DB::Int16>::Type()), "Float64");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfIntegerDivision<DB::UInt8, DB::Int16>::Type()), "Int8");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfModulo<DB::UInt32, DB::Int8>::Type()), "Int8");
+}
+
+
+TEST(NumberTraits, FunctionIf)
+{
+    ifLeftType<DB::UInt8>();
+    ifLeftType<DB::UInt16>();
+    ifLeftType<DB::UInt32>();
+    ifLeftType<DB::UInt64>();
+    ifLeftType<DB::Int8>();
+    ifLeftType<DB::Int16>();
+    ifLeftType<DB::Int32>();
+    ifLeftType<DB::Int64>();
+    ifLeftType<DB::Float32>();
+    ifLeftType<DB::Float64>();
+}
+
diff --git a/src/Functions/tests/number_traits.cpp b/src/Functions/tests/number_traits.cpp
deleted file mode 100644
index f32ffd5ea97f6a0f296abc4c92dd696eab6f401c..0000000000000000000000000000000000000000
--- a/src/Functions/tests/number_traits.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include <iostream>
-
-#include <DataTypes/NumberTraits.h>
-
-
-static void printType(DB::UInt8) { std::cout << "UInt8"; }
-static void printType(DB::UInt16) { std::cout << "UInt16"; }
-static void printType(DB::UInt32) { std::cout << "UInt32"; }
-static void printType(DB::UInt64) { std::cout << "UInt64"; }
-static void printType(DB::Int8) { std::cout << "Int8"; }
-static void printType(DB::Int16) { std::cout << "Int16"; }
-static void printType(DB::Int32) { std::cout << "Int32"; }
-static void printType(DB::Int64) { std::cout << "Int64"; }
-static void printType(DB::Float32) { std::cout << "Float32"; }
-static void printType(DB::Float64) { std::cout << "Float64"; }
-static void printType(DB::NumberTraits::Error) { std::cout << "Error"; }
-
-template <typename T0, typename T1>
-void ifRightType()
-{
-    printType(T0());
-    std::cout << ", ";
-    printType(T1());
-    std::cout << " -> ";
-    printType(typename DB::NumberTraits::ResultOfIf<T0, T1>::Type());
-    std::cout << std::endl;
-}
-
-template <typename T0>
-void ifLeftType()
-{
-    ifRightType<T0, DB::UInt8>();
-    ifRightType<T0, DB::UInt16>();
-    ifRightType<T0, DB::UInt32>();
-    ifRightType<T0, DB::UInt64>();
-    ifRightType<T0, DB::Int8>();
-    ifRightType<T0, DB::Int16>();
-    ifRightType<T0, DB::Int32>();
-    ifRightType<T0, DB::Int64>();
-    ifRightType<T0, DB::Float32>();
-    ifRightType<T0, DB::Float64>();
-}
-
-int main(int, char **)
-{
-    printType(DB::NumberTraits::ResultOfAdditionMultiplication<DB::UInt8, DB::UInt8>::Type()); std::cout << std::endl;
-    printType(DB::NumberTraits::ResultOfAdditionMultiplication<DB::UInt8, DB::Int32>::Type()); std::cout << std::endl;
-    printType(DB::NumberTraits::ResultOfAdditionMultiplication<DB::UInt8, DB::Float32>::Type()); std::cout << std::endl;
-    printType(DB::NumberTraits::ResultOfSubtraction<DB::UInt8, DB::UInt8>::Type()); std::cout << std::endl;
-    printType(DB::NumberTraits::ResultOfSubtraction<DB::UInt16, DB::UInt8>::Type()); std::cout << std::endl;
-    printType(DB::NumberTraits::ResultOfSubtraction<DB::UInt16, DB::Int8>::Type()); std::cout << std::endl;
-    printType(DB::NumberTraits::ResultOfFloatingPointDivision<DB::UInt16, DB::Int16>::Type()); std::cout << std::endl;
-    printType(DB::NumberTraits::ResultOfFloatingPointDivision<DB::UInt32, DB::Int16>::Type()); std::cout << std::endl;
-    printType(DB::NumberTraits::ResultOfIntegerDivision<DB::UInt8, DB::Int16>::Type()); std::cout << std::endl;
-    printType(DB::NumberTraits::ResultOfModulo<DB::UInt32, DB::Int8>::Type()); std::cout << std::endl;
-
-    ifLeftType<DB::UInt8>();
-    ifLeftType<DB::UInt16>();
-    ifLeftType<DB::UInt32>();
-    ifLeftType<DB::UInt64>();
-    ifLeftType<DB::Int8>();
-    ifLeftType<DB::Int16>();
-    ifLeftType<DB::Int32>();
-    ifLeftType<DB::Int64>();
-    ifLeftType<DB::Float32>();
-    ifLeftType<DB::Float64>();
-
-    return 0;
-}
diff --git a/src/IO/tests/gtest_bit_io.cpp b/src/IO/tests/gtest_bit_io.cpp
index 98539ea85a3305a7b54147c71c36b18ff26778a7..437ec13e93c71277bbe2ba467544ad3c968ca66a 100644
--- a/src/IO/tests/gtest_bit_io.cpp
+++ b/src/IO/tests/gtest_bit_io.cpp
@@ -8,7 +8,6 @@
 #include <Common/PODArray.h>
 
 #include <cmath>
-#include <iomanip>
 #include <memory>
 #include <bitset>
 #include <string>
diff --git a/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp b/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
index 2c90fad310696f3319a1b7a9f837762474e2c96b..4936307a5e35bcce03c1578663bc70c1d7ccfb9c 100644
--- a/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
+++ b/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
@@ -5,7 +5,6 @@
 #include <IO/CascadeWriteBuffer.h>
 #include <IO/MemoryReadWriteBuffer.h>
 #include <IO/WriteBufferFromTemporaryFile.h>
-#include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/ConcatReadBuffer.h>
 #include <IO/copyData.h>
diff --git a/src/IO/tests/parse_int_perf.cpp b/src/IO/tests/parse_int_perf.cpp
index 266dee96fb66a46d4c645d2c81a6ea7282e34553..93f49d80258cf9793425221e5f8d2e5efa95c3e5 100644
--- a/src/IO/tests/parse_int_perf.cpp
+++ b/src/IO/tests/parse_int_perf.cpp
@@ -7,9 +7,6 @@
 #include <IO/WriteHelpers.h>
 #include <IO/WriteIntText.h>
 #include <IO/WriteBufferFromVector.h>
-#include <IO/WriteBufferFromString.h>
-#include <IO/AsynchronousWriteBuffer.h>
-#include <Compression/CompressedWriteBuffer.h>
 #include <Compression/CompressedReadBuffer.h>
 
 #include <Common/Stopwatch.h>
diff --git a/src/IO/tests/read_buffer.cpp b/src/IO/tests/read_buffer.cpp
index 08c5fd563fa81dbf8b91dd7fc3ee7ab01b994892..952f8136a63f14b93463b8e0c7be40dfacc4e1cd 100644
--- a/src/IO/tests/read_buffer.cpp
+++ b/src/IO/tests/read_buffer.cpp
@@ -1,7 +1,6 @@
 #include <string>
 
 #include <iostream>
-#include <sstream>
 
 #include <Core/Types.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/IO/tests/read_buffer_perf.cpp b/src/IO/tests/read_buffer_perf.cpp
index 8269858ac644c051deda44398031427cf3647ad4..74520a630417b05bd10482fe5384d42925cab3ac 100644
--- a/src/IO/tests/read_buffer_perf.cpp
+++ b/src/IO/tests/read_buffer_perf.cpp
@@ -1,7 +1,6 @@
 #include <string>
 
 #include <iostream>
-#include <fstream>
 
 #include <Core/Types.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/IO/tests/read_escaped_string.cpp b/src/IO/tests/read_escaped_string.cpp
index 55f18c29c815a1db9aad80e3ddd17380a56fe12b..db99e094c069448af62b473fe334d7f63f61b64a 100644
--- a/src/IO/tests/read_escaped_string.cpp
+++ b/src/IO/tests/read_escaped_string.cpp
@@ -2,7 +2,6 @@
 
 #include <iostream>
 
-#include <Core/Types.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/ConcatReadBuffer.h>
diff --git a/src/IO/tests/read_write_int.cpp b/src/IO/tests/read_write_int.cpp
index 52b21ee7de6dcfdc7f66dec3192b136da83e35d1..903940db5e4e2b7e32c6b15fb277b81c1d737076 100644
--- a/src/IO/tests/read_write_int.cpp
+++ b/src/IO/tests/read_write_int.cpp
@@ -1,7 +1,6 @@
 #include <string>
 
 #include <iostream>
-#include <sstream>
 
 #include <Core/Types.h>
 #include <IO/ReadBufferFromString.h>
diff --git a/src/IO/tests/valid_utf8.cpp b/src/IO/tests/valid_utf8.cpp
index 0174f76f7d82ab61e59ea72d3dc6f9d7e52e6577..070a0a4c1163793e5ed15df5ced00f551c545fe5 100644
--- a/src/IO/tests/valid_utf8.cpp
+++ b/src/IO/tests/valid_utf8.cpp
@@ -1,11 +1,8 @@
 #include <IO/WriteBufferValidUTF8.h>
 #include <IO/WriteBufferFromString.h>
-#include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <string>
-#include <streambuf>
 #include <iostream>
-#include <cstdio>
 
 int main(int, char **)
 {
diff --git a/src/IO/tests/valid_utf8_perf.cpp b/src/IO/tests/valid_utf8_perf.cpp
index ce9edcbb382a1fe6b8271de9f58357e6490b5122..b95cdb2c27c9ca5f41df11fffa6a1938ac94024c 100644
--- a/src/IO/tests/valid_utf8_perf.cpp
+++ b/src/IO/tests/valid_utf8_perf.cpp
@@ -2,9 +2,7 @@
 #include <IO/WriteBufferFromString.h>
 #include <Common/Stopwatch.h>
 #include <string>
-#include <streambuf>
 #include <iostream>
-#include <cstdio>
 
 int main(int argc, char ** argv)
 {
diff --git a/src/IO/tests/write_buffer.cpp b/src/IO/tests/write_buffer.cpp
index feb9e5903ae71fcc0b9f8d99773a45d6d0e29e5d..8737f29cffb5cdaf96f7b71d8942412cec99b3d8 100644
--- a/src/IO/tests/write_buffer.cpp
+++ b/src/IO/tests/write_buffer.cpp
@@ -1,7 +1,6 @@
 #include <string>
 
 #include <iostream>
-#include <sstream>
 
 #include <Core/Types.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/IO/tests/zlib_buffers.cpp b/src/IO/tests/zlib_buffers.cpp
index 3c7af125a5a77e24d7190305611aa1be4eaadef0..3428d5e995adcd3685d46e29cc111f28067e2aa3 100644
--- a/src/IO/tests/zlib_buffers.cpp
+++ b/src/IO/tests/zlib_buffers.cpp
@@ -3,7 +3,6 @@
 #include <iostream>
 #include <iomanip>
 
-#include <Core/Types.h>
 #include <Common/Stopwatch.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadBufferFromFile.h>
diff --git a/src/Parsers/tests/gtest_dictionary_parser.cpp b/src/Parsers/tests/gtest_dictionary_parser.cpp
index 31b6d6cdd813f5ba5f4836c65b5d644bfc64d1f7..b5a0f16d5d2092385be158fa0171ed3d2bec4023 100644
--- a/src/Parsers/tests/gtest_dictionary_parser.cpp
+++ b/src/Parsers/tests/gtest_dictionary_parser.cpp
@@ -1,9 +1,6 @@
-#include <iostream>
-
 #include <Core/Types.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTDropQuery.h>
-#include <Parsers/ParserDictionary.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ParserDropQuery.h>
 #include <Parsers/formatAST.h>
@@ -11,7 +8,6 @@
 #include <Parsers/DumpASTNode.h>
 #include <Parsers/TablePropertiesQueriesASTs.h>
 #include <Parsers/ParserTablePropertiesQuery.h>
-#include <sstream>
 
 #include <gtest/gtest.h>
 
diff --git a/src/Parsers/tests/lexer.cpp b/src/Parsers/tests/lexer.cpp
index 074338d15b99251557b871662e83a08d75609041..b1d0bb6212cc4a8377e3f4e20c477229f790e23b 100644
--- a/src/Parsers/tests/lexer.cpp
+++ b/src/Parsers/tests/lexer.cpp
@@ -1,6 +1,5 @@
 #include <map>
 #include <Parsers/Lexer.h>
-#include <Parsers/TokenIterator.h>
 #include <Core/Types.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
diff --git a/src/Parsers/tests/lexer_fuzzer.cpp b/src/Parsers/tests/lexer_fuzzer.cpp
index 83d7396b291b8f7f1ff30e5abecc291d4a792ef2..8ebe39cb67b85a242abeee0e0ac8ca255e853e75 100644
--- a/src/Parsers/tests/lexer_fuzzer.cpp
+++ b/src/Parsers/tests/lexer_fuzzer.cpp
@@ -1,6 +1,5 @@
 #include <map>
 #include <Parsers/Lexer.h>
-#include <Parsers/TokenIterator.h>
 #include <Core/Types.h>
 
 #include <IO/ReadBufferFromMemory.h>
diff --git a/src/Storages/tests/get_abandonable_lock_in_all_partitions.cpp b/src/Storages/tests/get_abandonable_lock_in_all_partitions.cpp
index 533db3236fd0705043f548193b0c5d1530e4ab81..7f50041e68ef81f24f48b75a50d8aa8903c16f74 100644
--- a/src/Storages/tests/get_abandonable_lock_in_all_partitions.cpp
+++ b/src/Storages/tests/get_abandonable_lock_in_all_partitions.cpp
@@ -1,5 +1,3 @@
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
 #include <Common/Config/ConfigProcessor.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/Exception.h>
@@ -7,7 +5,6 @@
 #include <Storages/MergeTree/EphemeralLockInZooKeeper.h>
 
 #include <ext/scope_guard.h>
-#include <pcg_random.hpp>
 
 #include <iostream>
 
diff --git a/src/Storages/tests/get_current_inserts_in_replicated.cpp b/src/Storages/tests/get_current_inserts_in_replicated.cpp
index f1a87b5ca0543e15f202958e357adb2ad999ec8b..fa998d20f6690e0872a95784d26b347f1771ec19 100644
--- a/src/Storages/tests/get_current_inserts_in_replicated.cpp
+++ b/src/Storages/tests/get_current_inserts_in_replicated.cpp
@@ -4,10 +4,8 @@
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/Exception.h>
 #include <Common/Stopwatch.h>
-#include <Storages/MergeTree/EphemeralLockInZooKeeper.h>
 
 #include <ext/scope_guard.h>
-#include <pcg_random.hpp>
 
 #include <iostream>
 
diff --git a/src/Storages/tests/gtest_SplitTokenExtractor.cpp b/src/Storages/tests/gtest_SplitTokenExtractor.cpp
index cb801cff808e2eac57e8a543613bd9125d9753d6..d2c1c3ebd76fb85b63bbeda67aa5d1450eac6459 100644
--- a/src/Storages/tests/gtest_SplitTokenExtractor.cpp
+++ b/src/Storages/tests/gtest_SplitTokenExtractor.cpp
@@ -1,7 +1,6 @@
 #include <Storages/MergeTree/MergeTreeIndexFullText.h>
 
 #include <Common/PODArray_fwd.h>
-#include <Common/PODArray.h>
 
 #include <gtest/gtest.h>
 
diff --git a/src/Storages/tests/gtest_storage_log.cpp b/src/Storages/tests/gtest_storage_log.cpp
index 13c96fbab542f08b110dbec73280469c04551ec6..912aad813669bf46b776774f9a5aaa3a27af6f92 100644
--- a/src/Storages/tests/gtest_storage_log.cpp
+++ b/src/Storages/tests/gtest_storage_log.cpp
@@ -2,7 +2,6 @@
 
 #include <Columns/ColumnsNumber.h>
 #include <DataStreams/IBlockOutputStream.h>
-#include <DataStreams/LimitBlockInputStream.h>
 #include <DataStreams/copyData.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Disks/tests/gtest_disk.h>
diff --git a/src/Storages/tests/merge_selector.cpp b/src/Storages/tests/merge_selector.cpp
index caa795297e16bcf8f1644b49d5308152743b92d9..b4b668f1b02193cce03713dcb3f15d82431ecbf8 100644
--- a/src/Storages/tests/merge_selector.cpp
+++ b/src/Storages/tests/merge_selector.cpp
@@ -2,7 +2,6 @@
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/ReadHelpers.h>
 #include <Storages/MergeTree/SimpleMergeSelector.h>
-#include <Storages/MergeTree/LevelMergeSelector.h>
 
 
 /** This program tests merge-selecting algorithm.
diff --git a/src/Storages/tests/transform_part_zk_nodes.cpp b/src/Storages/tests/transform_part_zk_nodes.cpp
index 35e44bb94467277529894f2682d74a1bd7525e81..3cbcc76190ede8ece993bc55311dbe27d432d32a 100644
--- a/src/Storages/tests/transform_part_zk_nodes.cpp
+++ b/src/Storages/tests/transform_part_zk_nodes.cpp
@@ -1,6 +1,4 @@
 #include <Storages/MergeTree/ReplicatedMergeTreePartHeader.h>
-#include <IO/WriteBufferFromString.h>
-#include <IO/WriteHelpers.h>
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/ZooKeeper/ZooKeeper.h>