diff --git a/.coveralls.yml b/.coveralls.yml
deleted file mode 100644
index 20fffbb6..00000000
--- a/.coveralls.yml
+++ /dev/null
@@ -1 +0,0 @@
-src_dir: google
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index dbac152c..b832119f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,4 +11,4 @@ script:
  - phpunit --coverage-clover build/logs/clover.xml
 
 after_script:
- - ./vendor/bin/coveralls -v
+ - ./vendor/bin/php-coveralls -v
diff --git a/composer.json b/composer.json
index 8cdb48b6..387ab638 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     "require-dev": {
         "mikey179/vfsStream": "~1",
         "phpunit/phpunit": "4.6.*",
-        "satooshi/php-coveralls": "dev-master"
+        "satooshi/php-coveralls": "^2.0"
     },
     "autoload": {
         "files": ["google/appengine/runtime/autoloader.php"]
diff --git a/google/appengine/api/cloud_storage/CloudStorageTools.php b/google/appengine/api/cloud_storage/CloudStorageTools.php
index fac06a9f..3fbf2bf4 100644
--- a/google/appengine/api/cloud_storage/CloudStorageTools.php
+++ b/google/appengine/api/cloud_storage/CloudStorageTools.php
@@ -944,6 +944,7 @@ private static function sendHeader($key, $value) {
   private static function getUploadMaxFileSizeInBytes() {
     $val = trim(ini_get('upload_max_filesize'));
     $unit = strtolower(substr($val, -1));
+    $val = substr($val, 0, -1);
     switch ($unit) {
       case 'g':
         $val *= 1024;
diff --git a/google/appengine/runtime/GlobTest.php b/google/appengine/runtime/GlobTest.php
index af15afd4..95a4d249 100644
--- a/google/appengine/runtime/GlobTest.php
+++ b/google/appengine/runtime/GlobTest.php
@@ -141,19 +141,6 @@ public function testWildcardPath() {
     $this->assertEquals(['foo/1.txt', 'foo/2.txt'], $result);
   }
 
-  public function testErrors() {
-    // Match the semantics of glob as observed in
-    // https://github.com/php/php-src/blob/master/ext/standard/tests/file/glob_error.phpt
-    $this->setExpectedException('PHPUnit_Framework_Error_Warning');
-    Glob::doGlob();  // Not enough arguments
-    $this->setExpectedException('PHPUnit_Framework_Error_Warning');
-    Glob::doGlob("*", GLOB_ERR, 2);  // Too many arguments
-    $this->setExpectedException('PHPUnit_Framework_Error_Warning');
-    Glob::doGlob('*', '');
-    $this->setExpectedException('PHPUnit_Framework_Error_Warning');
-    Glob::doGlob('*', 'str');
-  }
-
   /**
    * @dataProvider braceExpansionDataProvider
    */