3 files changed, 6 insertions, 5 deletions
diff --git a/tests/perf/decperf.cxx b/tests/perf/decperf.cxx
index cc8b39d0..41a93b3a 100644
--- a/tests/perf/decperf.cxx
+++ b/tests/perf/decperf.cxx
@@ -110,7 +110,7 @@ void DummyOutStream::overrun(size_t needed)
 {
   flush();
   if (avail() < needed)
-    throw rdr::Exception("Insufficient dummy output buffer");
+    throw std::out_of_range("Insufficient dummy output buffer");
 }
 
 CConn::CConn(const char *filename)
@@ -202,7 +202,7 @@ static struct stats runTest(const char *fn)
 
   try {
     cc = new CConn(fn);
-  } catch (rdr::Exception& e) {
+  } catch (std::exception& e) {
     fprintf(stderr, "Failed to open rfb file: %s\n", e.what());
     exit(1);
   }
@@ -211,7 +211,7 @@ static struct stats runTest(const char *fn)
     while (true)
       cc->processMsg();
   } catch (rdr::EndOfStream& e) {
-  } catch (rdr::Exception& e) {
+  } catch (std::exception& e) {
     fprintf(stderr, "Failed to run rfb file: %s\n", e.what());
     exit(1);
   }
diff --git a/tests/perf/encperf.cxx b/tests/perf/encperf.cxx
index 63794340..9c7c77fd 100644
--- a/tests/perf/encperf.cxx
+++ b/tests/perf/encperf.cxx
@@ -171,7 +171,7 @@ void DummyOutStream::overrun(size_t needed)
 {
   flush();
   if (avail() < needed)
-    throw rdr::Exception("Insufficient dummy output buffer");
+    throw std::out_of_range("Insufficient dummy output buffer");
 }
 
 CConn::CConn(const char *filename)
diff --git a/tests/unit/pixelformat.cxx b/tests/unit/pixelformat.cxx
index 9d86fb9f..54e68ccf 100644
--- a/tests/unit/pixelformat.cxx
+++ b/tests/unit/pixelformat.cxx
@@ -22,8 +22,9 @@
 
 #include <stdio.h>
 
+#include <stdexcept>
+
 #include <rfb/PixelFormat.h>
-#include <rfb/Exception.h>
 
 static void doTest(bool should_fail, int b, int d, bool e, bool t,
                    int rm, int gm, int bm, int rs, int gs, int bs)