diff --git a/apps/files_remote/appinfo/app.php b/apps/files_remote/appinfo/app.php
index 25473d87feed8de4b2675e20743d46a715d5c368..02c1c3ae31344b670f058024aac753e96efe94c7 100644
--- a/apps/files_remote/appinfo/app.php
+++ b/apps/files_remote/appinfo/app.php
@@ -8,3 +8,4 @@
 
 OC::$CLASSPATH['OC_Filestorage_FTP']='apps/files_remote/lib/ftp.php';
 OC::$CLASSPATH['OC_Filestorage_DAV']='apps/files_remote/lib/webdav.php';
+OC::$CLASSPATH['OC_Filestorage_Google']='apps/files_remote/lib/google.php';
diff --git a/lib/filestorage/google.php b/apps/files_remote/lib/google.php
similarity index 99%
rename from lib/filestorage/google.php
rename to apps/files_remote/lib/google.php
index 5de47650f63282a8872b4d3f5e03ff6a48a6c7fc..0d6db1987f85cb71187f6bee747c50160041610c 100644
--- a/lib/filestorage/google.php
+++ b/apps/files_remote/lib/google.php
@@ -24,14 +24,12 @@ require_once 'common.inc.php';
 
 class OC_Filestorage_Google extends OC_Filestorage_Common {
 
-	private $datadir;
 	private $consumer;
 	private $oauth_token;
 	private $sig_method;
 	private $entries;
 
 	public function __construct($arguments) {
-		$this->datadir = $arguments['datadir'];
 		$consumer_key = isset($arguments['consumer_key']) ? $arguments['consumer_key'] : 'anonymous';
 		$consumer_secret = isset($arguments['consumer_secret']) ? $arguments['consumer_secret'] : 'anonymous';
 		$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
diff --git a/apps/files_remote/tests/config.php b/apps/files_remote/tests/config.php
index e2eea72f244c1fbb05a3307362a5c2d04d184f36..9b40d2b98cf04549f4080a9648d3e39a00c6b69c 100644
--- a/apps/files_remote/tests/config.php
+++ b/apps/files_remote/tests/config.php
@@ -12,4 +12,11 @@ return array(
 		'password'=>'test',
 		'root'=>'/owncloud/files/webdav.php',
 	),
+	'google'=>array(
+		'consumer_key'=>'anonymous',
+		'consumer_secret'=>'anonymous',
+		'token'=>'test',
+		'token_secret'=>'test',
+		'root'=>'/google',
+	)
 );