diff --git a/.CI/common.groovy b/.CI/common.groovy
index 8c84eca3b6d..a46ff217bf2 100644
--- a/.CI/common.groovy
+++ b/.CI/common.groovy
@@ -258,7 +258,7 @@ void buildAndRunOMEditTestsuite(stash) {
      echo export OPENMODELICALIBRARY="\${MSYS_WORKSPACE}/build/lib/omlibrary"
      echo time make -f Makefile.omdev.mingw \${MAKETHREADS} omedit-testsuite
      echo cd build/bin
-     echo ./RunOMEditTestsuite
+     echo ./RunOMEditTestsuite.sh
      ) > buildOMEditTestsuiteWindows.sh
 
      set MSYSTEM=MINGW64
@@ -280,7 +280,7 @@ void buildAndRunOMEditTestsuite(stash) {
   sh "${makeCommand()} -j${numPhysicalCPU()} --output-sync omedit-testsuite" // Builds the OMEdit testsuite
   sh label: 'RunOMEditTestsuite', script: '''
   cd build/bin
-  xvfb-run ./RunOMEditTestsuite
+  xvfb-run ./RunOMEditTestsuite.sh
   '''
 
   }
diff --git a/OMEdit/Testsuite/BrowseElectricalAnalogBasic/BrowseElectricalAnalogBasic.pro b/OMEdit/Testsuite/BrowseMSL/BrowseMSL.pro
similarity index 97%
rename from OMEdit/Testsuite/BrowseElectricalAnalogBasic/BrowseElectricalAnalogBasic.pro
rename to OMEdit/Testsuite/BrowseMSL/BrowseMSL.pro
index 6444b557a6f..f8025af62b5 100644
--- a/OMEdit/Testsuite/BrowseElectricalAnalogBasic/BrowseElectricalAnalogBasic.pro
+++ b/OMEdit/Testsuite/BrowseMSL/BrowseMSL.pro
@@ -30,7 +30,7 @@
 
 include(../Common/Testsuite.pri)
 
-TARGET = BrowseElectricalAnalogBasic
+TARGET = BrowseMSL
 
 SOURCES += ../Common/Util.cpp \
   Test.cpp
diff --git a/OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/Test.cpp b/OMEdit/Testsuite/BrowseMSL/Test.cpp
similarity index 77%
rename from OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/Test.cpp
rename to OMEdit/Testsuite/BrowseMSL/Test.cpp
index 32c7e29ab6e..ab3e8059e8d 100644
--- a/OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/Test.cpp
+++ b/OMEdit/Testsuite/BrowseMSL/Test.cpp
@@ -45,11 +45,27 @@ extern "C" {
 
 OMEDITTEST_MAIN(Test)
 
-void Test::testcase()
+/*!
+ * \brief Test::electricalAnalogBasic
+ * Browses the Modelica.Electrical.Analog.Basic
+ */
+void Test::electricalAnalogBasic()
+{
+  if (!Util::expandLibraryTreeItemParentHierarchy(MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItem("Modelica.Electrical.Analog.Basic"))) {
+    QFAIL("Expanding to Modelica.Electrical.Analog.Basic failed.");
+  }
+  MainWindow::instance()->close();
+}
+
+/*!
+ * \brief Test::mediaAir
+ * Browses the Modelica.Media.Air
+ */
+void Test::mediaAir()
 {
   OMEDITTEST_SKIP("Enable this testcase by removing this line once the ticket#5669 (https://trac.openmodelica.org/OpenModelica/ticket/5669) is fixed.");
   if (!Util::expandLibraryTreeItemParentHierarchy(MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItem("Modelica.Media.Air"))) {
-    QFAIL("");
+    QFAIL("Expanding to Modelica.Media.Air failed.");
   }
   MainWindow::instance()->close();
 }
diff --git a/OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/Test.h b/OMEdit/Testsuite/BrowseMSL/Test.h
similarity index 96%
rename from OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/Test.h
rename to OMEdit/Testsuite/BrowseMSL/Test.h
index e297fb2efdd..f6df9ff3dbc 100644
--- a/OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/Test.h
+++ b/OMEdit/Testsuite/BrowseMSL/Test.h
@@ -42,7 +42,8 @@ class Test: public QObject
   Q_OBJECT
 
 private slots:
-  void testcase();
+  void electricalAnalogBasic();
+  void mediaAir();
 };
 
 #endif // TESTGUI_H
diff --git a/OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/BrowseMediaAirReferenceMoistAir.pro b/OMEdit/Testsuite/Diagram/Diagram.pro
similarity index 97%
rename from OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/BrowseMediaAirReferenceMoistAir.pro
rename to OMEdit/Testsuite/Diagram/Diagram.pro
index f6c6d410495..175405e08d8 100644
--- a/OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/BrowseMediaAirReferenceMoistAir.pro
+++ b/OMEdit/Testsuite/Diagram/Diagram.pro
@@ -30,7 +30,7 @@
 
 include(../Common/Testsuite.pri)
 
-TARGET = BrowseMediaAirReferenceMoistAir
+TARGET = Diagram
 
 SOURCES += ../Common/Util.cpp \
   Test.cpp
diff --git a/OMEdit/Testsuite/BrowseElectricalAnalogBasic/Test.cpp b/OMEdit/Testsuite/Diagram/Test.cpp
similarity index 60%
rename from OMEdit/Testsuite/BrowseElectricalAnalogBasic/Test.cpp
rename to OMEdit/Testsuite/Diagram/Test.cpp
index 330c6b5e4b0..5d299c848a5 100644
--- a/OMEdit/Testsuite/BrowseElectricalAnalogBasic/Test.cpp
+++ b/OMEdit/Testsuite/Diagram/Test.cpp
@@ -45,10 +45,24 @@ extern "C" {
 
 OMEDITTEST_MAIN(Test)
 
-void Test::testcase()
+/*!
+ * \brief Test::chuaCircuit
+ * Browses to Modelica.Electrical.Analog.Examples.ChuaCircuit and loads it diagram view.
+ */
+void Test::chuaCircuit()
 {
-  if (!Util::expandLibraryTreeItemParentHierarchy(MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItem("Modelica.Electrical.Analog.Basic"))) {
-    QFAIL("");
+  LibraryTreeItem *pLibraryTreeItem = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItem("Modelica.Electrical.Analog.Examples.ChuaCircuit");
+  if (!pLibraryTreeItem) {
+    QFAIL("Failed to find Modelica.Electrical.Analog.Examples.ChuaCircuit. Makesure MSL is loaded.");
+  }
+  if (!Util::expandLibraryTreeItemParentHierarchy(pLibraryTreeItem)) {
+    QFAIL("Expanding to Modelica.Electrical.Analog.Examples failed.");
   }
+
+  // Open the Modelica.Electrical.Analog.Examples.ChuaCircuit diagram.
+  QModelIndex modelIndex = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->libraryTreeItemIndex(pLibraryTreeItem);
+  QModelIndex proxyIndex = MainWindow::instance()->getLibraryWidget()->getLibraryTreeProxyModel()->mapFromSource(modelIndex);
+  MainWindow::instance()->getLibraryWidget()->getLibraryTreeView()->libraryTreeItemDoubleClicked(proxyIndex);
+
   MainWindow::instance()->close();
 }
diff --git a/OMEdit/Testsuite/BrowseElectricalAnalogBasic/Test.h b/OMEdit/Testsuite/Diagram/Test.h
similarity index 98%
rename from OMEdit/Testsuite/BrowseElectricalAnalogBasic/Test.h
rename to OMEdit/Testsuite/Diagram/Test.h
index e297fb2efdd..4e5b523d16a 100644
--- a/OMEdit/Testsuite/BrowseElectricalAnalogBasic/Test.h
+++ b/OMEdit/Testsuite/Diagram/Test.h
@@ -42,7 +42,7 @@ class Test: public QObject
   Q_OBJECT
 
 private slots:
-  void testcase();
+  void chuaCircuit();
 };
 
 #endif // TESTGUI_H
diff --git a/OMEdit/Testsuite/Makefile.omdev.mingw b/OMEdit/Testsuite/Makefile.omdev.mingw
index f3eda334044..5291631b91b 100644
--- a/OMEdit/Testsuite/Makefile.omdev.mingw
+++ b/OMEdit/Testsuite/Makefile.omdev.mingw
@@ -22,7 +22,7 @@ mkbuilddirs:
 
 install: build
 	cp -p ../bin/tests/*$(EXE) $(builddir_bin)
-	cp -p RunOMEditTestsuite $(builddir_bin)
+	cp -p RunOMEditTestsuite.sh $(builddir_bin)
 
 build: Makefile
 	$(MAKE) -f Makefile
diff --git a/OMEdit/Testsuite/Makefile.unix.in b/OMEdit/Testsuite/Makefile.unix.in
index a38a117c46e..231cdc3fc84 100644
--- a/OMEdit/Testsuite/Makefile.unix.in
+++ b/OMEdit/Testsuite/Makefile.unix.in
@@ -4,7 +4,7 @@ QMAKE=@QMAKE@
 
 install: build
 	cp -p ../bin/tests/* @OMBUILDDIR@/bin
-	cp -p RunOMEditTestsuite @OMBUILDDIR@/bin
+	cp -p RunOMEditTestsuite.sh @OMBUILDDIR@/bin
 
 build: Makefile OMEditGUI.unix.config.pri
 	$(MAKE) -f Makefile
diff --git a/OMEdit/Testsuite/RunOMEditTestsuite b/OMEdit/Testsuite/RunOMEditTestsuite.sh
similarity index 86%
rename from OMEdit/Testsuite/RunOMEditTestsuite
rename to OMEdit/Testsuite/RunOMEditTestsuite.sh
index 2b80404e0ea..f57252a20f8 100755
--- a/OMEdit/Testsuite/RunOMEditTestsuite
+++ b/OMEdit/Testsuite/RunOMEditTestsuite.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-testcases=( "BrowseElectricalAnalogBasic" "BrowseMediaAirReferenceMoistAir" )
+testcases=( "BrowseMSL" "Diagram" )
 OMEditTestResults="$PWD/OMEditTestResult"
 
 for i in "${testcases[@]}"
diff --git a/OMEdit/Testsuite/Testsuite.pro b/OMEdit/Testsuite/Testsuite.pro
index 336f12d0163..0387b818467 100644
--- a/OMEdit/Testsuite/Testsuite.pro
+++ b/OMEdit/Testsuite/Testsuite.pro
@@ -30,6 +30,6 @@
 
 TEMPLATE = subdirs
 
-SUBDIRS = BrowseElectricalAnalogBasic \
-  BrowseMediaAirReferenceMoistAir
+SUBDIRS = BrowseMSL \
+  Diagram