diff --git a/src/tl/unit_tests/tlHttpStream.cc b/src/tl/unit_tests/tlHttpStream.cc
index 298cb60e1..a5b94df9d 100644
--- a/src/tl/unit_tests/tlHttpStream.cc
+++ b/src/tl/unit_tests/tlHttpStream.cc
@@ -23,6 +23,7 @@
 
 #include "tlHttpStream.h"
 #include "tlUnitTest.h"
+#include "tlTimer.h"
 
 #include <QCoreApplication>
 
@@ -100,10 +101,12 @@ TEST(3)
   stream.send ();
   EXPECT_EQ (stream.data_available (), false);
 
-  while (! stream.data_available ()) {
+  tl::Clock start = tl::Clock::current ();
+  while (! r.flag && (tl::Clock::current () - start).seconds () < 10) {
     QCoreApplication::processEvents (QEventLoop::ExcludeUserInputEvents);
   }
   EXPECT_EQ (r.flag, true);
+  EXPECT_EQ (stream.data_available (), true);
 
   char b[100];
   size_t n = stream.read (b, sizeof (b));
diff --git a/testdata/klayout_main/main.rb b/testdata/klayout_main/main.rb
index 228f5d44a..1601ce803 100644
--- a/testdata/klayout_main/main.rb
+++ b/testdata/klayout_main/main.rb
@@ -60,7 +60,7 @@ class KLayoutMain_TestClass < TestBase
   def test_4
 
     # Application class
-    if !RBA.constants.find { |x| x == :QDialog }
+    if !RBA.constants.find { |x| x == :QDialog || x == "QDialog" }
 
       out = `./klayout -b -r #{File.join(File.dirname(__FILE__), "test_app.rb")}`
       assert_equal(out, "RBA::Application superclass Object\nMainWindow is not there\n")