diff --git a/src/FactSystem/ParameterManagerTest.cc b/src/FactSystem/ParameterManagerTest.cc
index ae362f2780f6ed657bb18b3f50aa3bebbe0c3bb2..9ed18f0cdefd10f01ea56bc0a3e91bf422283273 100644
--- a/src/FactSystem/ParameterManagerTest.cc
+++ b/src/FactSystem/ParameterManagerTest.cc
@@ -64,10 +64,12 @@ void ParameterManagerTest::_requestListMissingParamSuccess(void)
     _noFailureWorker(MockConfiguration::FailMissingParamOnInitialReqest);
 }
 
-#if 0
 // Test no response to param_request_list
 void ParameterManagerTest::_requestListNoResponse(void)
 {
+    // Will pop error about request failure
+    setExpectedMessageBox(QMessageBox::Ok);
+
     Q_ASSERT(!_mockLink);
     _mockLink = MockLink::startPX4MockLink(false, MockConfiguration::FailParamNoReponseToRequestList);
 
@@ -93,9 +95,8 @@ void ParameterManagerTest::_requestListNoResponse(void)
     QCOMPARE(spyParamsReady.wait(40000), false);
 
     // User should have been notified
-    checkMultipleExpectedMessageBox(5);
+    checkExpectedMessageBox();
 }
-#endif
 
 // MockLink will fail to send a param on initial request, it will also fail to send it on subsequent
 // param_read requests.
diff --git a/src/FactSystem/ParameterManagerTest.h b/src/FactSystem/ParameterManagerTest.h
index 7d732169f2354b855490dc8cd2516942b305f142..374eebba5a91df0b1497e94f91ef8b46c5d227d6 100644
--- a/src/FactSystem/ParameterManagerTest.h
+++ b/src/FactSystem/ParameterManagerTest.h
@@ -22,8 +22,7 @@ class ParameterManagerTest : public UnitTest
     
 private slots:
     void _noFailure(void);
-    // FIXME: Hack to work around changed no reponse handling
-    //void _requestListNoResponse(void);
+    void _requestListNoResponse(void);
     void _requestListMissingParamSuccess(void);
     void _requestListMissingParamFail(void);