diff --git a/storage/test/Makefile.in b/storage/test/Makefile.in
index d15a328d77a..1ea6709254c 100644
--- a/storage/test/Makefile.in
+++ b/storage/test/Makefile.in
@@ -60,6 +60,7 @@ CPP_UNIT_TESTS = \
   test_AsXXX_helpers.cpp \
   test_StatementCache.cpp \
   test_async_callbacks_with_spun_event_loops.cpp \
+  test_file_perms.cpp \
   $(NULL)
 
 ifdef MOZ_DEBUG
diff --git a/storage/test/test_file_perms.cpp b/storage/test/test_file_perms.cpp
new file mode 100644
index 00000000000..f01bf2b56ff
--- /dev/null
+++ b/storage/test/test_file_perms.cpp
@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is storage test code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Brad Lassey <brad@lassey.us>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "storage_test_harness.h"
+#include "nsILocalFile.h"
+
+/**
+ * This file tests that the file permissions of the sqlite files match what
+ * we request they be
+ */
+
+void
+test_file_perms()
+{
+  nsCOMPtr<nsIFile> profDir;
+  nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
+                                       getter_AddRefs(profDir));
+  nsCOMPtr<nsILocalFile> sqlite_file = do_QueryInterface(profDir);
+  sqlite_file->Append(NS_LITERAL_STRING("places.sqlite"));
+  PRUint32 perms = 0;
+  sqlite_file->GetPermissions(&perms);
+
+  // This reflexts the permissions defined by SQLITE_DEFAULT_FILE_PERMISSIONS in
+  // db/sqlite3/src/Makefile.in and must be kept in sync with that
+#ifdef ANDROID
+  do_check_true(perms == PR_IRUSR | PR_IWUSR);
+#else
+  do_check_true(perms == PR_IRUSR | PR_IWUSR | PR_IRGRP | PR_IWGRP | PR_IROTH | PR_IWOTH);
+#endif
+}
+
+void (*gTests[])(void) = {
+  test_file_perms,
+};
+
+const char *file = __FILE__;
+#define TEST_NAME "file perms"
+#define TEST_FILE file
+#include "storage_test_harness_tail.h"