--- a/src/core/model/test.cc	Tue Oct 01 07:15:41 2013 -0700
+++ b/src/core/model/test.cc	Tue Oct 01 08:10:32 2013 -0700
@@ -890,12 +890,7 @@
   bool printTestTypeList = false;
   bool printTestNameList = false;
   bool printTestTypeAndName = false;
-#ifdef WIN32
-  enum TestCase::TestDuration maximumTestDuration = TestCase::QUICK;// TestCase::TAKES_FOREVER;
-
-#else
   enum TestCase::TestDuration maximumTestDuration = TestCase::QUICK;
-#endif
   char *progname = argv[0];
 
   argv++;
@@ -1097,6 +1092,7 @@
       delete os;
     }
 
+    }
   return failed?1:0;
 }
 
@@ -1109,4 +1105,5 @@
   return TestRunnerImpl::Instance ()->Run (argc, argv);
 }
 
+
 } // namespace ns3

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mesh/test/dot11s/regression.cc	Tue Oct 01 08:10:32 2013 -0700
@@ -0,0 +1,43 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2009 IITP RAS
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Authors: Kirill Andreev <andreev@iitp.ru>
+ */
+
+#include "ns3/test.h"
+#include "pmp-regression.h"
+#include "hwmp-reactive-regression.h"
+#include "hwmp-proactive-regression.h"
+#include "hwmp-simplest-regression.h"
+#include "hwmp-target-flags-regression.h"
+
+using namespace ns3;
+class Dot11sRegressionSuite : public TestSuite
+{
+public:
+  Dot11sRegressionSuite () : TestSuite ("devices-mesh-dot11s-regression", SYSTEM) 
+  {
+    // We do not use NS_TEST_SOURCEDIR variable here since mesh/test has 
+    // subdirectories
+    SetDataDir (std::string ("src/mesh/test/dot11s"));
+    AddTestCase (new PeerManagementProtocolRegressionTest, TestCase::QUICK);
+    AddTestCase (new HwmpSimplestRegressionTest, TestCase::QUICK);
+    AddTestCase (new HwmpReactiveRegressionTest, TestCase::QUICK);
+    AddTestCase (new HwmpProactiveRegressionTest, TestCase::QUICK);
+    AddTestCase (new HwmpDoRfRegressionTest, TestCase::QUICK);
+  }
+} g_dot11sRegressionSuite;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mesh/test/flame/regression.cc	Tue Oct 01 08:10:32 2013 -0700
@@ -0,0 +1,35 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2009 IITP RAS
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Authors: Pavel Boyko <boyko@iitp.ru>
+ */
+
+#include "ns3/test.h"
+#include "flame-regression.h"
+
+using namespace ns3;
+class FlameRegressionSuite : public TestSuite
+{
+public:
+  FlameRegressionSuite () : TestSuite ("devices-mesh-flame-regression", SYSTEM) 
+  {
+    // We do not use NS_TEST_SOURCEDIR variable here since mesh/test has 
+    // subdirectories
+    SetDataDir (std::string ("src/mesh/test/flame"));
+    AddTestCase (new FlameRegressionTest, TestCase::QUICK);
+  }
+} g_flameRegressionSuite;