diff --git a/tests/lib/SimpleSAML/Store/SQLTest.php b/tests/lib/SimpleSAML/Store/SQLTest.php
index 09b4ddbf5a9964662e5f7536be8c2adec472d392..56f21156a8e06d42864c9522b2bfb251de04729b 100644
--- a/tests/lib/SimpleSAML/Store/SQLTest.php
+++ b/tests/lib/SimpleSAML/Store/SQLTest.php
@@ -93,7 +93,7 @@ class SQLTest extends \PHPUnit_Framework_TestCase
 
         $value = $store->get('test', 'foo');
 
-        $this->assertEquals(null, $value);
+        $this->assertNull($value);
     }
 
     /**
@@ -106,10 +106,10 @@ class SQLTest extends \PHPUnit_Framework_TestCase
     {
         /** @var \SimpleSAML\Store\SQL $store */
         $store = Store::getInstance();
-        
+
         $store->set('test', 'foo', 'bar');
         $value = $store->get('test', 'foo');
-        
+
         $this->assertEquals('bar', $value);
     }
 
@@ -147,7 +147,7 @@ class SQLTest extends \PHPUnit_Framework_TestCase
         $store->delete('test', 'foo');
         $value = $store->get('test', 'foo');
 
-        $this->assertEquals(null, $value);
+        $this->assertNull($value);
     }
 
     /**
@@ -167,7 +167,7 @@ class SQLTest extends \PHPUnit_Framework_TestCase
         $store->delete('test', $key);
         $value = $store->get('test', $key);
 
-        $this->assertEquals(null, $value);
+        $this->assertNull($value);
     }
 
     protected function tearDown()
diff --git a/tests/lib/SimpleSAML/StoreTest.php b/tests/lib/SimpleSAML/StoreTest.php
index 6fd9650fc9120938c36112cefe75ab6984351b1d..e807d5c8479490db44bd32ae7a342b0ca69bac90 100644
--- a/tests/lib/SimpleSAML/StoreTest.php
+++ b/tests/lib/SimpleSAML/StoreTest.php
@@ -27,7 +27,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
 
         $store = Store::getInstance();
 
-        $this->assertEquals(false, $store);
+        $this->assertFalse($store);
     }
 
 
@@ -42,7 +42,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
 
         $store = Store::getInstance();
 
-        $this->assertEquals(false, $store);
+        $this->assertFalse($store);
     }