diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index bcc6649d5be8e3d4aa21e4d9a234daf84fec5c26..5f0e7cfd5c73873815112416b69ddcc7aa0045ee 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -324,7 +324,7 @@ class SimpleSAML_Utilities {
 
 
 	/**
-     * @deprecated This method will be removed in SSP 2.0. Please use openssl_random_pseudo_bytes() instead.
+	 * @deprecated This method will be removed in SSP 2.0. Please use openssl_random_pseudo_bytes() instead.
 	 */
 	public static function generateRandomBytes($length) {
 		assert('is_int($length)');
diff --git a/tests/Utils/ArraysTest.php b/tests/Utils/ArraysTest.php
index 1aa6ad43193168037a0a983e2c671d019ba35385..5cc00de5dc2657a10dd26f680f29befc5e3c3278 100644
--- a/tests/Utils/ArraysTest.php
+++ b/tests/Utils/ArraysTest.php
@@ -36,7 +36,7 @@ class Utils_ArraysTest extends PHPUnit_Framework_TestCase
     /**
      * Test the normalizeAttributesArray() function with input not being an array
      *
-     * @expectedException SimpleSAML_Error_Exception
+     * @expectedException InvalidArgumentException
      */
     public function testNormalizeAttributesArrayBadInput()
     {
@@ -46,7 +46,7 @@ class Utils_ArraysTest extends PHPUnit_Framework_TestCase
     /**
      * Test the normalizeAttributesArray() function with an array with non-string attribute names.
      *
-     * @expectedException SimpleSAML_Error_Exception
+     * @expectedException InvalidArgumentException
      */
     public function testNormalizeAttributesArrayBadKeys()
     {
@@ -56,7 +56,7 @@ class Utils_ArraysTest extends PHPUnit_Framework_TestCase
     /**
      * Test the normalizeAttributesArray() function with an array with non-string attribute values.
      *
-     * @expectedException SimpleSAML_Error_Exception
+     * @expectedException InvalidArgumentException
      */
     public function testNormalizeAttributesArrayBadValues()
     {