--- a/tests/js-elapsedtimer/main.cpp	Wed Apr 27 07:37:00 2016 +0200
+++ b/tests/js-elapsedtimer/main.cpp	Wed Apr 27 13:07:21 2016 +0200
@@ -26,11 +26,6 @@
 using namespace irccd;
 using namespace std::chrono_literals;
 
-/*
- * For all tests, we tolerate 30 ms because some systems have bigger lags.
- */
-static constexpr int margin = 30;
-
 class TestElapsedTimer : public testing::Test {
 protected:
 	duk::Context m_context;
@@ -40,12 +35,6 @@
 		loadJsIrccd(m_context);
 		loadJsElapsedTimer(m_context);
 	}
-
-	inline void assertRange(int value, int expected) const noexcept
-	{
-		if (value < (expected - margin) || value > (expected + margin))
-			FAIL() << value << " is bigger than [" << (expected - margin) << ", " << (expected + margin) << "]";
-	}
 };
 
 TEST_F(TestElapsedTimer, standard)
@@ -59,7 +48,8 @@
 		if (duk::pevalString(m_context, "result = timer.elapsed();") != 0)
 			throw duk::error(m_context, -1);
 
-		assertRange(duk::getGlobal<int>(m_context, "result"), 300);
+		ASSERT_GE(duk::getGlobal<int>(m_context, "result"), 250);
+		ASSERT_LE(duk::getGlobal<int>(m_context, "result"), 350);
 	} catch (const std::exception &ex) {
 		FAIL() << ex.what();
 	}
@@ -76,64 +66,7 @@
 		if (duk::pevalString(m_context, "timer.reset(); result = timer.elapsed();") != 0)
 			throw duk::error(m_context, -1);
 
-		assertRange(duk::getGlobal<int>(m_context, "result"), 0);
-	} catch (const std::exception &ex) {
-		FAIL() << ex.what();
-	}
-}
-
-TEST_F(TestElapsedTimer, pause)
-{
-	try {
-		if (duk::pevalString(m_context, "timer = new Irccd.ElapsedTimer();") != 0)
-			throw duk::error(m_context, -1);
-
-		/*
-		 * Simulate a pause in the game like this:
-		 *
-		 * start     pause restart elapsed
-		 * |   10ms   |.5ms.| 6ms  |
-		 *
-		 * Since the game was paused, the 5ms must not be totalized.
-		 */
-		std::this_thread::sleep_for(10ms);
-
-		if (duk::pevalString(m_context, "timer.pause();") != 0)
-			throw duk::error(m_context, -1);
-
-		std::this_thread::sleep_for(5ms);
-
-		if (duk::pevalString(m_context, "timer.restart();") != 0)
-			throw duk::error(m_context, -1);
-
-		std::this_thread::sleep_for(6ms);
-
-		if (duk::pevalString(m_context, "result = timer.elapsed()") != 0)
-			throw duk::error(m_context, -1);
-
-		assertRange(duk::getGlobal<int>(m_context, "result"), 16);
-	} catch (const std::exception &ex) {
-		FAIL() << ex.what();
-	}
-}
-
-TEST_F(TestElapsedTimer, doublecheck)
-{
-	try {
-		if (duk::pevalString(m_context, "timer = new Irccd.ElapsedTimer();") != 0)
-			throw duk::error(m_context, -1);
-
-		std::this_thread::sleep_for(50ms);
-
-		if (duk::pevalString(m_context, "result = timer.elapsed()") != 0)
-			throw duk::error(m_context, -1);
-
-		std::this_thread::sleep_for(50ms);
-
-		if (duk::pevalString(m_context, "result = timer.elapsed()") != 0)
-			throw duk::error(m_context, -1);
-
-		assertRange(duk::getGlobal<int>(m_context, "result"), 100);
+		ASSERT_LE(duk::getGlobal<int>(m_context, "result"), 100);
 	} catch (const std::exception &ex) {
 		FAIL() << ex.what();
 	}