diff --git a/test_suite/unit_tests/Airports/CMakeLists.txt b/test_suite/unit_tests/Airports/CMakeLists.txt
index bd55a8216..b191396a5 100644
--- a/test_suite/unit_tests/Airports/CMakeLists.txt
+++ b/test_suite/unit_tests/Airports/CMakeLists.txt
@@ -2,12 +2,14 @@
 set(TESTSUITE_SOURCES
     ${TESTSUITE_SOURCES}
     ${CMAKE_CURRENT_SOURCE_DIR}/TestSuite.cxx
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_airport.cxx
     ${CMAKE_CURRENT_SOURCE_DIR}/test_runway.cxx
     PARENT_SCOPE
 )
 
 set(TESTSUITE_HEADERS
     ${TESTSUITE_HEADERS}
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_runway.hxx
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_airport.hxx
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_runway.cxx
     PARENT_SCOPE
 )
diff --git a/test_suite/unit_tests/Airports/TestSuite.cxx b/test_suite/unit_tests/Airports/TestSuite.cxx
index 0c70af3db..9d49787c7 100644
--- a/test_suite/unit_tests/Airports/TestSuite.cxx
+++ b/test_suite/unit_tests/Airports/TestSuite.cxx
@@ -17,6 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "test_airport.hxx"
 #include "test_runway.hxx"
 
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(AirportTests, "Unit tests");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(RunwayTests, "Unit tests");
diff --git a/test_suite/unit_tests/Airports/test_airport.cxx b/test_suite/unit_tests/Airports/test_airport.cxx
new file mode 100644
index 000000000..111483a56
--- /dev/null
+++ b/test_suite/unit_tests/Airports/test_airport.cxx
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2021 Keith Paterson
+ *
+ * This file is part of the program FlightGear.
+ *
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "test_airport.hxx"
+
+#include <iostream>
+#include <cstring>
+#include <memory>
+#include <unistd.h>
+
+#include "test_suite/FGTestApi/NavDataCache.hxx"
+#include "test_suite/FGTestApi/TestDataLogger.hxx"
+#include "test_suite/FGTestApi/testGlobals.hxx"
+
+#include <simgear/math/sg_geodesy.hxx>
+#include <simgear/math/SGGeod.hxx>
+#include <AIModel/AIAircraft.hxx>
+#include <AIModel/AIFlightPlan.hxx>
+#include <AIModel/AIManager.hxx>
+#include <AIModel/performancedb.hxx>
+
+#include <Airports/airport.hxx>
+#include <Airports/airportdynamicsmanager.hxx>
+#include <Airports/runways.hxx>
+#include <Traffic/TrafficMgr.hxx>
+#include <Time/TimeManager.hxx>
+
+#include <ATC/atc_mgr.hxx>
+
+#include <Main/fg_props.hxx>
+#include <Main/globals.hxx>
+
+/////////////////////////////////////////////////////////////////////////////
+
+// Set up function for each test.
+void AirportTests::setUp() {
+    FGTestApi::setUp::initTestGlobals("timeManager");
+    FGTestApi::setUp::initTestGlobals("Traffic");
+    FGTestApi::setUp::initNavDataCache();
+}
+
+// Clean up after each test.
+void AirportTests::tearDown()
+{
+}
+
+/**
+ * @brief Read an airport from the apt.dat
+ * 
+ */
+void AirportTests::testAirport()
+{
+    FGAirportRef departureAirport = FGAirport::getByIdent("YSSY");
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Must have correct id", (std::string)"YSSY", departureAirport->getId());
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Must have runways", (uint)6, departureAirport->numRunways());
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Must have runway 16R", true, departureAirport->hasRunwayWithIdent("16R"));
+        
+    int length = 3962;
+
+    FGRunwayRef runway = departureAirport->getRunwayByIdent("16R");
+    int calculated = SGGeodesy::distanceM(runway->begin(), runway->end());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Distance between the runway endpoints should be runway length", length, calculated, 1);
+    calculated = SGGeodesy::distanceM(runway->begin(), runway->pointOnCenterline(-length));
+    CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Distance between the runway start and point on centerline should be runway length", length, calculated, 1);
+
+}
diff --git a/test_suite/unit_tests/Airports/test_airport.hxx b/test_suite/unit_tests/Airports/test_airport.hxx
new file mode 100644
index 000000000..8fa740c21
--- /dev/null
+++ b/test_suite/unit_tests/Airports/test_airport.hxx
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2021 Keith Paterson
+ *
+ * This file is part of the program FlightGear.
+ *
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <memory>
+
+#include <simgear/props/props.hxx>
+
+class SGGeod;
+
+// The flight plan unit tests.
+class AirportTests : public CppUnit::TestFixture
+{
+    // Set up the test suite.
+    CPPUNIT_TEST_SUITE(AirportTests);
+    CPPUNIT_TEST(testAirport);
+    CPPUNIT_TEST_SUITE_END();
+
+
+public:
+    // Set up function for each test.
+    void setUp();
+
+    // Clean up after each test.
+    void tearDown();
+
+    // The tests.
+    void testAirport();
+};