diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1e88703d406d6464dfc52e5deab8deeb1d0f49a8..17a0463c2c345e42ca49d7078dfef36be3d96f33 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-23  Hans-Peter Nilsson  <hp@axis.com>
+
+	* testsuite/26_numerics/random/poisson_distribution/operators/values.cc:
+	Don't run the libstdc++/83237 part on simulator targets.
+
 2019-05-23  Jonathan Wakely  <jwakely@redhat.com>
 
 	* doc/xml/manual/status_cxx2017.xml: Add feature test macro for
diff --git a/libstdc++-v3/testsuite/26_numerics/random/poisson_distribution/operators/values.cc b/libstdc++-v3/testsuite/26_numerics/random/poisson_distribution/operators/values.cc
index 0b03d948b6acf0f239c4ea46e4873f454ed8ae9e..2a45081ff67811461c3b9bfeb91627417beadc20 100644
--- a/libstdc++-v3/testsuite/26_numerics/random/poisson_distribution/operators/values.cc
+++ b/libstdc++-v3/testsuite/26_numerics/random/poisson_distribution/operators/values.cc
@@ -1,3 +1,4 @@
+// { dg-options "-DSIMULATOR_TEST" { target simulator } }
 // { dg-do run { target c++11 } }
 // { dg-require-cstdint "" }
 // { dg-require-cmath "" }
@@ -43,11 +44,14 @@ void test01()
   auto bpd3 = std::bind(pd3, eng);
   testDiscreteDist(bpd3, [](int n) { return poisson_pdf(n, 30.0); } );
 
+  // This can take extremely long on simulators, timing out the test.
+#ifndef SIMULATOR_TEST
   // libstdc++/83237
   std::poisson_distribution<> pd4(37.17);
   auto bpd4 = std::bind(pd4, eng);
   testDiscreteDist<100, 2000000>(bpd4, [](int n)
 				 { return poisson_pdf(n, 37.17); } );
+#endif
 }
 
 int main()