diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt
index f736f8227..115d30abb 100644
--- a/maxscale-system-test/CMakeLists.txt
+++ b/maxscale-system-test/CMakeLists.txt
@@ -199,9 +199,6 @@ add_test_executable(maxctrl_basic.cpp maxctrl_basic replication LABELS maxctrl R
 # MXS-2167: Monitors should be able to use extra_port
 add_test_executable(mxs2167_extra_port.cpp mxs2167_extra_port mxs2167_extra_port LABELS REPL_BACKEND)
 
-# TODO: Remove this once MXS-2167 is fixed
-set_tests_properties(mxs2167_extra_port PROPERTIES WILL_FAIL TRUE)
-
 ############################################
 # BEGIN: Tests that require GTID           #
 ############################################
diff --git a/maxscale-system-test/mxs2167_extra_port.cpp b/maxscale-system-test/mxs2167_extra_port.cpp
index 4ff2db352..40e6e743c 100644
--- a/maxscale-system-test/mxs2167_extra_port.cpp
+++ b/maxscale-system-test/mxs2167_extra_port.cpp
@@ -20,6 +20,11 @@ int main(int argc, char** argv)
     // Add the extra_port parameter to all servers
     for (int i = 0; i < test.repl->N; i++)
     {
+        // Temporary workaround for firewall issues
+        test.repl->ssh_node_f(i, true,
+                              "iptables -I INPUT -p tcp --dport 33066 -j ACCEPT;"
+                              "ip6tables -I INPUT -p tcp --dport 33066 -j ACCEPT");
+
         test.repl->stash_server_settings(i);
         test.repl->add_server_setting(i, "extra_port=33066");
         test.repl->ssh_node_f(i, true, "service mysql restart");