diff --git a/test/stressGUI.cxx b/test/stressGUI.cxx
index 9587ee23de7bc..3ea963df8ba11 100644
--- a/test/stressGUI.cxx
+++ b/test/stressGUI.cxx
@@ -1997,45 +1997,6 @@ void testHelpDialog()
    hd->CloseWindow();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-/// Test the ASImage palette editor.
-
-void testPaletteEditor()
-{
-   const char *fname = "galaxy.root";
-   TFile *gal = 0;
-   if (!gSystem->AccessPathName(fname)) {
-      gal = TFile::Open(fname);
-   } else {
-      gal = TFile::Open(Form("http://root.cern/files/%s",fname));
-   }
-   if (!gal) return;
-   TImage *img = (TImage*)gal->Get("n4254");
-   //img->Draw();
-
-   TASPaletteEditor *f = new TASPaletteEditor((TAttImage *)img, 80, 25);
-   ProcessFrame((TGMainFrame*)f, "Palette Editor");
-   f->CloseWindow();
-
-   delete img;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-/// Test the HTML Browser.
-
-void testHtmlBrowser()
-{
-   TGHtmlBrowser *b = new TGHtmlBrowser("https://bellenot.web.cern.ch/public/html_test/html_test.html");
-   ProcessFrame((TGMainFrame*)b, "HTML Browser 1");
-   b->Selected("https://bellenot.web.cern.ch/public/html_test/gallery/");
-   ProcessFrame((TGMainFrame*)b, "HTML Browser 2");
-   b->CloseWindow();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 //                             ROOT GUI tutorials
 ////////////////////////////////////////////////////////////////////////////////
@@ -2057,21 +2018,21 @@ const char *excluded[] = {
 Int_t bexec(TString &dir, const char *macro)
 {
 #ifdef WIN32
-   return gSystem->Exec(TString::Format("set ROOT_HIST=0 & root.exe -q exec_macro.C(\\\"%s/%s\\\") >nul 2>&1", dir.Data(), macro));
+   return gSystem->Exec(TString::Format("set ROOT_HIST=0 & root.exe -l -q exec_macro.C(\\\"%s/%s\\\") >nul 2>&1", dir.Data(), macro));
 #else
-   return gSystem->Exec(TString::Format("ROOT_HIST=0 root.exe -q exec_macro.C\\(\\\"%s/%s\\\"\\) >&/dev/null", dir.Data(), macro));
+   return gSystem->Exec(TString::Format("ROOT_HIST=0 root.exe -l -q exec_macro.C\\(\\\"%s/%s\\\"\\) >&/dev/null", dir.Data(), macro));
 #endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-/// Run the macros available in $ROOTSYS/tutorials/gui
+/// Run the macros available in $ROOTSYS/tutorials/visualisation/gui
 
 void run_tutorials()
 {
    gClient->HandleInput();
    gSystem->Sleep(50);
    gSystem->ProcessEvents();
-   TString dir = gRootSys + "/tutorials/gui";
+   TString dir = gRootSys + "/tutorials/visualisation/gui";
    TString savdir = gSystem->WorkingDirectory();
    TSystemDirectory sysdir(dir.Data(), dir.Data());
    TList *files = sysdir.GetListOfFiles();
@@ -2083,12 +2044,12 @@ void run_tutorials()
       bexec(dir, "hsimple.C");
       gSystem->Unlink("hsimple_1.png");
    }
-   dir += "/tree";
+   dir += "io/tree/";
    reqfile = dir + "/cernstaff.root";
    if (gSystem->AccessPathName(reqfile, kFileExists)) {
-      bexec(dir, "cernbuild.C");
+      bexec(dir, "tree500_cernbuild.C");
    }
-   dir = gRootSys + "/tutorials/gui";
+   dir = gRootSys + "/tutorials/visualisation/gui";
 
    if (files) {
       TIter next(files);
@@ -2113,7 +2074,7 @@ void run_tutorials()
       }
       delete files;
    }
-   dir = gRootSys + "/tutorials/image";
+   dir = gRootSys + "/tutorials/visualisation/image";
    bexec(dir, "galaxy_image.C");
    ProcessMacro("galaxy_image.C", "galaxy_image.C");
 
@@ -2155,7 +2116,7 @@ void guitest_playback()
    printf("Guitest Playback..............................................");
    gSystem->RedirectOutput(gTmpfilename.Data(), "w", &gRH);
    TString savdir = gSystem->WorkingDirectory();
-   TString dir = gRootSys + "/tutorials/gui";
+   TString dir = gRootSys + "/tutorials/visualisation/gui";
    gSystem->ChangeDirectory(dir.Data());
 
    // first delete old files, if any
@@ -2230,7 +2191,7 @@ void dnd_playback()
 #else
    filename += "_x11.root";
 #endif
-   TString dir = gRootSys + "/tutorials/gui";
+   TString dir = gRootSys + "/tutorials/visualisation/gui";
    gSystem->ChangeDirectory(dir.Data());
 
    TStopwatch sw;
@@ -2265,7 +2226,7 @@ void mditest_playback()
    printf("MDI Test Playback.............................................");
    gSystem->RedirectOutput(gTmpfilename.Data(), "w", &gRH);
    TString savdir = gSystem->WorkingDirectory();
-   TString dir = gRootSys + "/tutorials/gui";
+   TString dir = gRootSys + "/tutorials/visualisation/gui";
    gSystem->ChangeDirectory(dir.Data());
 
    TStopwatch sw;
@@ -2300,7 +2261,7 @@ void graph_edit_playback()
    printf("Graphic Editors Playback......................................");
    gSystem->RedirectOutput(gTmpfilename.Data(), "w", &gRH);
    TString savdir = gSystem->WorkingDirectory();
-   TString dir = gRootSys + "/tutorials/graphics";
+   TString dir = gRootSys + "/tutorials/visualisation/graphics";
    gSystem->ChangeDirectory(dir.Data());
 
    TStopwatch sw;
@@ -2335,7 +2296,7 @@ void fitpanel_playback()
    printf("Fit Panel Playback ...........................................");
    gSystem->RedirectOutput(gTmpfilename.Data(), "w", &gRH);
    TString savdir = gSystem->WorkingDirectory();
-   TString dir = gRootSys + "/tutorials/fit";
+   TString dir = gRootSys + "/tutorials/math/fit";
    gSystem->ChangeDirectory(dir.Data());
 
    TStopwatch sw;
@@ -2416,7 +2377,7 @@ void stressGUI()
    gBenchmark->Start("stressGUI");
 
    if (!gOptionRef) {
-      std::cout << "*  Running macros in $ROOTSYS/tutorials/gui - S T R E S S            *" <<std::endl;
+      std::cout << "*  Running macros in tutorials/visualisation/gui - S T R E S S       *" <<std::endl;
       std::cout << "**********************************************************************" <<std::endl;
    }
    run_tutorials();
@@ -2452,8 +2413,6 @@ void stressGUI()
    testSplitFrame();
    testControlBars();
    testHelpDialog();
-   testPaletteEditor();
-   testHtmlBrowser();
 
    if (!gOptionRef) {