diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index f5102c584623598fdd8f9b2c78359440bfdc02ab..cd61aa08bdda33253b88653e4658cb970052b53c 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -650,7 +650,8 @@ HEADERS += \
 	src/qgcunittest/TCPLoopBackServer.h \
 	src/qgcunittest/QGCUASFileManagerTest.h \
     src/qgcunittest/PX4RCCalibrationTest.h \
-    src/qgcunittest/LinkManagerTest.h
+    src/qgcunittest/LinkManagerTest.h \
+    src/qgcunittest/MainWindowTest.h
 
 SOURCES += \
     src/qgcunittest/UnitTest.cc \
@@ -668,7 +669,8 @@ SOURCES += \
 	src/qgcunittest/TCPLoopBackServer.cc \
 	src/qgcunittest/QGCUASFileManagerTest.cc \
     src/qgcunittest/PX4RCCalibrationTest.cc \
-    src/qgcunittest/LinkManagerTest.cc
+    src/qgcunittest/LinkManagerTest.cc \
+    src/qgcunittest/MainWindowTest.cc
 }
 
 #
diff --git a/src/qgcunittest/MainWindowTest.cc b/src/qgcunittest/MainWindowTest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9e757d1f7ee30d619ccb63806153f90226f550a1
--- /dev/null
+++ b/src/qgcunittest/MainWindowTest.cc
@@ -0,0 +1,57 @@
+/*=====================================================================
+ 
+ QGroundControl Open Source Ground Control Station
+ 
+ (c) 2009 - 2014 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ 
+ This file is part of the QGROUNDCONTROL project
+ 
+ QGROUNDCONTROL is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ 
+ QGROUNDCONTROL 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 QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+ 
+ ======================================================================*/
+
+/// @file
+///     @brief Simple MainWindow unit test
+///
+///     @author Don Gagne <don@thegagnes.com>
+
+#include "MainWindowTest.h"
+#include "MainWindow.h"
+
+UT_REGISTER_TEST(MainWindowTest)
+
+MainWindowTest::MainWindowTest(void)
+{
+    
+}
+
+void MainWindowTest::init(void)
+{
+    UnitTest::init();
+}
+
+void MainWindowTest::cleanup(void)
+{
+    UnitTest::cleanup();
+}
+
+void MainWindowTest::_simpleDisplay_test(void)
+{
+    MainWindow* mainWindow = MainWindow::_create(NULL, MainWindow::CUSTOM_MODE_PX4);
+    Q_CHECK_PTR(mainWindow);
+    
+    mainWindow->close();
+    
+    delete mainWindow;
+}
diff --git a/src/qgcunittest/MainWindowTest.h b/src/qgcunittest/MainWindowTest.h
new file mode 100644
index 0000000000000000000000000000000000000000..083938d73aa1beac5d892a4fb284b53f21d2c4fe
--- /dev/null
+++ b/src/qgcunittest/MainWindowTest.h
@@ -0,0 +1,50 @@
+/*=====================================================================
+ 
+ QGroundControl Open Source Ground Control Station
+ 
+ (c) 2009 - 2014 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ 
+ This file is part of the QGROUNDCONTROL project
+ 
+ QGROUNDCONTROL is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ 
+ QGROUNDCONTROL 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 QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+ 
+ ======================================================================*/
+
+/// @file
+///     @brief Simple MainWindow unit test
+///
+///     @author Don Gagne <don@thegagnes.com>
+
+#ifndef MAINWINDOWTEST_H
+#define MAINWINDOWTEST_H
+
+#include "UnitTest.h"
+
+class MainWindowTest : public UnitTest
+{
+    Q_OBJECT
+    
+public:
+    MainWindowTest(void);
+    
+private slots:
+    UT_DECLARE_DEFAULT_initTestCase
+    UT_DECLARE_DEFAULT_cleanupTestCase
+    void init(void);
+    void cleanup(void);
+    
+    void _simpleDisplay_test(void);
+};
+
+#endif