diff --git a/roottest/root/hist/CMakeLists.txt b/roottest/root/hist/CMakeLists.txt
index 2b3edf5ca28bd..f4c216918ba78 100644
--- a/roottest/root/hist/CMakeLists.txt
+++ b/roottest/root/hist/CMakeLists.txt
@@ -5,6 +5,7 @@ ROOTTEST_ADD_TEST(mergeTH2Poly
 ROOTTEST_ADD_TEST(assertSparseToTHn
                   MACRO assertSparseToTHn.C
                   COPY_TO_BUILDDIR effectiveCorrection.root)
+
 if(fortran AND CMAKE_Fortran_COMPILER AND NOT CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
   ROOTTEST_ADD_TEST(h2root
                     COMMAND h2root mb4i1.hbook
diff --git a/roottest/root/hist/division/CMakeLists.txt b/roottest/root/hist/division/CMakeLists.txt
index 69502660e835d..cb39aa82a198d 100644
--- a/roottest/root/hist/division/CMakeLists.txt
+++ b/roottest/root/hist/division/CMakeLists.txt
@@ -1,2 +1,3 @@
-ROOTTEST_ADD_TEST(runtestTEfficiency MACRO runtestTEfficiency.C OUTREF testTEfficiency.ref)
-
+ROOTTEST_ADD_TEST(runtestTEfficiency
+                  MACRO runtestTEfficiency.C
+                  OUTREF testTEfficiency.ref)
diff --git a/roottest/root/hist/formula/CMakeLists.txt b/roottest/root/hist/formula/CMakeLists.txt
index 7b1fd06c0aa0f..b91033ee19197 100644
--- a/roottest/root/hist/formula/CMakeLists.txt
+++ b/roottest/root/hist/formula/CMakeLists.txt
@@ -1,7 +1,20 @@
-ROOTTEST_ADD_TEST(assertTernary MACRO assertTernary.C OUTREF assertTernary.ref)
-ROOTTEST_ADD_TEST(execGetExp MACRO execGetExp.C OUTREF execGetExp.ref)
+ROOTTEST_ADD_TEST(assertTernary
+                  MACRO assertTernary.C
+                  OUTREF assertTernary.ref)
+
+ROOTTEST_ADD_TEST(execGetExp
+                  MACRO execGetExp.C
+                  OUTREF execGetExp.ref)
+
 ROOTTEST_ADD_TEST(runformio
                   MACRO runformio.C
-                  COPY_TO_BUILDDIR result_30gev_sep05.root)
-ROOTTEST_ADD_TEST(runrecurse MACRO runrecurse.C OUTREF recurse.ref)
-ROOTTEST_ADD_TEST(runstring MACRO runstring.C OUTREF string.ref)
+                  COPY_TO_BUILDDIR result_30gev_sep05.root
+                  OUTREF formio.ref)
+
+ROOTTEST_ADD_TEST(runrecurse
+                  MACRO runrecurse.C
+                  OUTREF recurse.ref)
+
+ROOTTEST_ADD_TEST(runstring
+                  MACRO runstring.C
+                  OUTREF string.ref)
diff --git a/roottest/root/hist/misc/CMakeLists.txt b/roottest/root/hist/misc/CMakeLists.txt
index baf0e07b6ddf4..747a3d0a118ab 100644
--- a/roottest/root/hist/misc/CMakeLists.txt
+++ b/roottest/root/hist/misc/CMakeLists.txt
@@ -1,5 +1,11 @@
-ROOTTEST_ADD_TEST(runownership MACRO runownership.C+ OUTREF ownership.ref)
-ROOTTEST_ADD_TEST(testSparse MACRO testSparse.cxx OUTREF testSparse.ref)
+ROOTTEST_ADD_TEST(runownership
+                  MACRO runownership.C+
+                  OUTREF ownership.ref)
+
+ROOTTEST_ADD_TEST(testSparse
+                  MACRO testSparse.cxx
+                  OUTREF testSparse.ref)
+
 ROOT_ADD_GTEST(gh15874 test_gh15874.cxx
                COPY_TO_BUILDDIR ${CMAKE_CURRENT_SOURCE_DIR}/test_gh15874.root
                LIBRARIES ROOT::Core ROOT::Hist ROOT::RIO)
diff --git a/roottest/root/hist/operator/rootlogon.C b/roottest/root/hist/operator/rootlogon.C
deleted file mode 100644
index 0a5b15451d9ff..0000000000000
--- a/roottest/root/hist/operator/rootlogon.C
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-#ifdef __APPLE__
-gSystem->Load("libHist");
-#endif
-}
diff --git a/roottest/root/hist/operator/run.C b/roottest/root/hist/operator/run.C
index 83afbd6365ccc..3d8dce176f491 100644
--- a/roottest/root/hist/operator/run.C
+++ b/roottest/root/hist/operator/run.C
@@ -1,6 +1,6 @@
 {
-gErrorIgnoreLevel=1;
-if (!gSystem->CompileMacro("add.C","k")) {
-   gApplication->Terminate(1);
-}
+   gErrorIgnoreLevel = 1;
+   if (!gSystem->CompileMacro("add.C","k")) {
+      gApplication->Terminate(1);
+   }
 }
diff --git a/roottest/root/hist/operator/runcopy.C b/roottest/root/hist/operator/runcopy.C
index 82321d6ead39c..d464a7b4aa2fa 100644
--- a/roottest/root/hist/operator/runcopy.C
+++ b/roottest/root/hist/operator/runcopy.C
@@ -2,9 +2,9 @@
 #include "TDirectory.h"
 #include "TList.h"
 
-TH1F *h=0;
-TH1F *h2=0;
-TH1F *h3=0;
+TH1F *h = nullptr;
+TH1F *h2 = nullptr;
+TH1F *h3 = nullptr;
 
 void runcopy()
 {
diff --git a/roottest/root/hist/profile/CMakeLists.txt b/roottest/root/hist/profile/CMakeLists.txt
index f6085fcb7c0ac..cb2441bc2c5df 100644
--- a/roottest/root/hist/profile/CMakeLists.txt
+++ b/roottest/root/hist/profile/CMakeLists.txt
@@ -1 +1,3 @@
-ROOTTEST_ADD_TEST(runcopy MACRO runcopy.C OUTREF copy.ref)
+ROOTTEST_ADD_TEST(runcopy
+                  MACRO runcopy.C
+                  OUTREF copy.ref)
diff --git a/roottest/root/hist/th2PolyMerge.C b/roottest/root/hist/th2PolyMerge.C
index b28146bfffe3d..8d6021b77935c 100644
--- a/roottest/root/hist/th2PolyMerge.C
+++ b/roottest/root/hist/th2PolyMerge.C
@@ -1,10 +1,15 @@
-void FillPoly(TH2Poly& th2p){
+#include <iostream>
+using namespace std;
+
+void FillPoly(TH2Poly& th2p)
+{
    for (auto i : ROOT::TSeqI(1000)){
       th2p.Fill(gRandom->Uniform(),gRandom->Uniform(),gRandom->Uniform());
    }
 }
 
-TH2Poly *CreatePoly() {
+TH2Poly *CreatePoly()
+{
    auto h2p = new TH2Poly();
    Double_t x1[] = {0, 5, 6};
    Double_t y1[] = {0, 0, 5};
@@ -19,7 +24,8 @@ TH2Poly *CreatePoly() {
    return h2p;
 }
 
-TH2Poly *CreatePolyDiffContour() {
+TH2Poly *CreatePolyDiffContour()
+{
    auto h2p = new TH2Poly();
    Double_t x1[] = {0, 5, 6};
    Double_t y1[] = {0, 0, 5};
@@ -34,8 +40,8 @@ TH2Poly *CreatePolyDiffContour() {
    return h2p;
 }
 
-int th2PolyMerge() {
-
+int th2PolyMerge()
+{
    cout << "We expect two warnings to be printed:\n"
            " 1) About different number of bins\n"
            " 2) About different contours\n";
@@ -68,6 +74,4 @@ int th2PolyMerge() {
    if (totEntries != 0) return 3;
 
    return 0;
-
-
 }