diff --git a/test/OAuth2/GrantType/JwtBearerTest.php b/test/OAuth2/GrantType/JwtBearerTest.php
index e60023b3c..4c8f850a5 100644
--- a/test/OAuth2/GrantType/JwtBearerTest.php
+++ b/test/OAuth2/GrantType/JwtBearerTest.php
@@ -282,7 +282,7 @@ public function testInvalidJti()
         $server = $this->getTestServer();
         $request = TestRequest::createPost(array(
                 'grant_type' => 'urn:ietf:params:oauth:grant-type:jwt-bearer',  // valid grant type
-                'assertion' => $this->getJWT(99999999900, null, 'testuser@ourdomain.com', 'Test Client ID', 'used_jti'), // valid assertion with invalid scope
+                'assertion' => $this->getJWT(2147483647, null, 'testuser@ourdomain.com', 'Test Client ID', 'used_jti'), // valid assertion with invalid scope
         ));
         $token = $server->grantAccessToken($request, $response = new Response());
 
@@ -296,7 +296,7 @@ public function testJtiReplayAttack()
         $server = $this->getTestServer();
         $request = TestRequest::createPost(array(
                 'grant_type' => 'urn:ietf:params:oauth:grant-type:jwt-bearer',  // valid grant type
-                'assertion' => $this->getJWT(99999999900, null, 'testuser@ourdomain.com', 'Test Client ID', 'totally_new_jti'), // valid assertion with invalid scope
+                'assertion' => $this->getJWT(null, null, 'testuser@ourdomain.com', 'Test Client ID', 'totally_new_jti'), // valid assertion with invalid scope
         ));
         $token = $server->grantAccessToken($request, $response = new Response());
 
diff --git a/test/config/storage.json b/test/config/storage.json
index 52d3f2399..5938273e6 100644
--- a/test/config/storage.json
+++ b/test/config/storage.json
@@ -4,40 +4,40 @@
             "client_id": "Test Client ID",
             "user_id": "",
             "redirect_uri": "",
-            "expires": "9999999999",
+            "expires": 2147483647,
             "id_token": "IDTOKEN"
         },
         "testcode-with-scope": {
             "client_id": "Test Client ID",
             "user_id": "",
             "redirect_uri": "",
-            "expires": "9999999999",
+            "expires": 2147483647,
             "scope": "scope1 scope2"
         },
         "testcode-expired": {
             "client_id": "Test Client ID",
             "user_id": "",
             "redirect_uri": "",
-            "expires": "1356998400"
+            "expires": 1356998400
         },
         "testcode-empty-secret": {
             "client_id": "Test Client ID Empty Secret",
             "user_id": "",
             "redirect_uri": "",
-            "expires": "9999999999"
+            "expires": 2147483647
         },
         "testcode-openid": {
             "client_id": "Test Client ID",
             "user_id": "",
             "redirect_uri": "",
-            "expires": "9999999999",
+            "expires": 2147483647,
             "id_token": "test_id_token"
         },
         "testcode-redirect-uri": {
             "client_id": "Test Client ID",
             "user_id": "",
             "redirect_uri": "http://brentertainment.com/voil%C3%A0",
-            "expires": "9999999999",
+            "expires": 2147483647,
             "id_token": "IDTOKEN"
         }
     },
@@ -122,19 +122,19 @@
         "accesstoken-scope": {
             "access_token": "accesstoken-scope",
             "client_id": "Test Client ID",
-            "expires": 99999999900,
+            "expires": 2147483647,
             "scope": "testscope"
         },
         "accesstoken-openid-connect": {
             "access_token": "accesstoken-openid-connect",
             "client_id": "Test Client ID",
             "user_id": "testuser",
-            "expires": 99999999900,
+            "expires": 2147483647,
             "scope": "openid email"
         },
         "accesstoken-malformed": {
             "access_token": "accesstoken-mallformed",
-            "expires": 99999999900,
+            "expires": 2147483647,
             "scope": "testscope"
         }
     },
@@ -165,7 +165,7 @@
             "issuer": "Test Client ID",
             "subject": "testuser@ourdomain.com",
             "audience": "http://myapp.com/oauth/auth",
-            "expires": 99999999900,
+            "expires": 2147483647,
             "jti": "used_jti"
         }
     ],