diff --git a/tests/Android.mk b/tests/Android.mk
new file mode 100644
index 0000000..382e9cf
--- /dev/null
+++ b/tests/Android.mk
@@ -0,0 +1,16 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    org.cyanogenmod.platform.sdk
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_NAME := CMPlatformTests
+LOCAL_CERTIFICATE := platform
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+include $(BUILD_PACKAGE)
\ No newline at end of file
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
new file mode 100644
index 0000000..d3ab9dc
--- /dev/null
+++ b/tests/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="org.cyanogenmod.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-permission android:name="android.permission.PUBLISH_QUICK_SETTINGS_TILE" />
+
+    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
+        <activity android:name=".customtiles.CMStatusBarTest"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <activity android:name=".customtiles.DummySettings"
+                  android:label="@string/app_name" />
+    </application>
+</manifest>
diff --git a/tests/res/drawable-hdpi/ic_launcher.png b/tests/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..96a442e
Binary files /dev/null and b/tests/res/drawable-hdpi/ic_launcher.png differ
diff --git a/tests/res/drawable-ldpi/ic_launcher.png b/tests/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000..9923872
Binary files /dev/null and b/tests/res/drawable-ldpi/ic_launcher.png differ
diff --git a/tests/res/drawable-mdpi/ic_launcher.png b/tests/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..359047d
Binary files /dev/null and b/tests/res/drawable-mdpi/ic_launcher.png differ
diff --git a/tests/res/drawable-xhdpi/ic_launcher.png b/tests/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..71c6d76
Binary files /dev/null and b/tests/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/tests/res/layout/main.xml b/tests/res/layout/main.xml
new file mode 100644
index 0000000..fbc4640
--- /dev/null
+++ b/tests/res/layout/main.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:gravity="center_horizontal"
+        >
+    <Button android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TEST PUBLISH TILE"
+            android:onClick="testPublishTile"/>
+    <Button android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TEST PUBLISH SETTINGS TILE"
+            android:onClick="testPublishTileWithSettings"/>
+    <Button android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TEST UPDATE TILE"
+            android:onClick="testUpdateTile"/>
+    <Button android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TEST REMOVE TILE"
+            android:onClick="testRemoveTile"/>
+
+    <Button android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TEST PUBLISH MULTIPLE"
+            android:onClick="testMultipleTilePublish"/>
+    <Button android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TEST REMOVE MULTIPLE"
+            android:onClick="testMultipleTileRemove"/>
+</LinearLayout>
+
diff --git a/tests/res/values/strings.xml b/tests/res/values/strings.xml
new file mode 100644
index 0000000..d8ff6de
--- /dev/null
+++ b/tests/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">CM Platform Tests</string>
+</resources>
diff --git a/tests/src/org/cyanogenmod/tests/TestActivity.java b/tests/src/org/cyanogenmod/tests/TestActivity.java
new file mode 100644
index 0000000..e692df4
--- /dev/null
+++ b/tests/src/org/cyanogenmod/tests/TestActivity.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cyanogenmod.tests;
+
+import android.app.ListActivity;
+import android.os.Bundle;
+
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+
+public abstract class TestActivity extends ListActivity
+{
+    Test[] mTests;
+
+    protected abstract String tag();
+    protected abstract Test[] tests();
+
+    protected abstract class Test {
+        protected String name;
+        protected Test(String n) {
+            name = n;
+        }
+        protected abstract void run();
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mTests = tests();
+
+        String[] labels = new String[mTests.length];
+        for (int i=0; i<mTests.length; i++) {
+            labels[i] = mTests[i].name;
+        }
+
+        setListAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, labels));
+    }
+
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id)
+    {
+        Test t = mTests[position];
+        android.util.Log.d(tag(), "Test: " + t.name);
+        t.run();
+    }
+
+}
\ No newline at end of file
diff --git a/tests/src/org/cyanogenmod/tests/customtiles/CMStatusBarTest.java b/tests/src/org/cyanogenmod/tests/customtiles/CMStatusBarTest.java
new file mode 100644
index 0000000..9d8d9df
--- /dev/null
+++ b/tests/src/org/cyanogenmod/tests/customtiles/CMStatusBarTest.java
@@ -0,0 +1,125 @@
+/**
+ * Copyright (c) 2015, The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cyanogenmod.tests.customtiles;
+
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.os.Handler;
+
+import cyanogenmod.app.CustomTile;
+import cyanogenmod.app.CMStatusBarManager;
+
+import org.cyanogenmod.tests.R;
+
+import org.cyanogenmod.tests.TestActivity;
+
+public class CMStatusBarTest extends TestActivity {
+
+    private static final int CUSTOM_TILE_ID = 1337;
+    private static final int CUSTOM_TILE_SETTINGS_ID = 1336;
+    private CustomTile mCustomTile;
+    private CMStatusBarManager mCMStatusBarManager;
+
+    Handler mHandler = new Handler();
+
+    @Override
+    protected String tag() {
+        return null;
+    }
+
+    @Override
+    protected Test[] tests() {
+        mCMStatusBarManager = CMStatusBarManager.getInstance(this);
+        return mTests;
+    }
+
+    private Test[] mTests = new Test[] {
+            new Test("test publish tile") {
+                public void run() {
+                    PendingIntent intent = PendingIntent.getActivity(CMStatusBarTest.this, 0,
+                            new Intent(CMStatusBarTest.this, CMStatusBarTest.class)
+                                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK), 0);
+                    mCustomTile = new CustomTile.Builder(CMStatusBarTest.this)
+                            .setLabel("Test From SDK")
+                            .setIcon(R.drawable.ic_launcher)
+                            .setOnClickIntent(intent)
+                            .setContentDescription("Content description")
+                            .build();
+                    mCMStatusBarManager.publishTile(CUSTOM_TILE_ID, mCustomTile);
+                }
+            },
+
+            new Test("test publish tile in 3 seconds") {
+                public void run() {
+                    mHandler.postDelayed(new Runnable() {
+                        public void run() {
+                            PendingIntent intent = PendingIntent.getActivity(CMStatusBarTest.this, 0,
+                                    new Intent(CMStatusBarTest.this, CMStatusBarTest.class)
+                                            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK), 0);
+                            mCustomTile = new CustomTile.Builder(CMStatusBarTest.this)
+                                    .setLabel("Test 3 seconds")
+                                    .setIcon(R.drawable.ic_launcher)
+                                    .setOnClickIntent(intent)
+                                    .setContentDescription("Content description")
+                                    .build();
+                            mCMStatusBarManager.publishTile(CUSTOM_TILE_ID, mCustomTile);
+                        }
+                    }, 3000);
+                }
+            },
+
+            new Test("test update tile") {
+                public void run() {
+                    if (mCustomTile != null) {
+                        mCustomTile.label = "Update From SDK";
+                        mCMStatusBarManager.publishTile(CUSTOM_TILE_ID, mCustomTile);
+                    }
+                }
+            },
+
+            new Test("test remove tile") {
+                public void run() {
+                    mCMStatusBarManager.removeTile(CUSTOM_TILE_ID);
+                }
+            },
+
+            new Test("test remove tile in 3 seconds") {
+                public void run() {
+                    mHandler.postDelayed(new Runnable() {
+                        public void run() {
+                            mCMStatusBarManager.removeTile(CUSTOM_TILE_ID);
+                        }
+                    }, 3000);
+                }
+            },
+
+            new Test("test publish tile with settings") {
+                public void run() {
+                    CustomTile customTile = new CustomTile.Builder(CMStatusBarTest.this)
+                            .setLabel("Test Settings From SDK")
+                            .setIcon(R.drawable.ic_launcher)
+                            .setOnSettingsClickIntent(new Intent(CMStatusBarTest.this,
+                                    DummySettings.class)
+                                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+                            .setContentDescription("Content description")
+                            .build();
+                    CMStatusBarManager.getInstance(CMStatusBarTest.this)
+                            .publishTile(CUSTOM_TILE_SETTINGS_ID, customTile);
+                }
+            },
+    };
+}
diff --git a/tests/src/org/cyanogenmod/tests/customtiles/DummySettings.java b/tests/src/org/cyanogenmod/tests/customtiles/DummySettings.java
new file mode 100644
index 0000000..ef7f1e6
--- /dev/null
+++ b/tests/src/org/cyanogenmod/tests/customtiles/DummySettings.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2015, The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cyanogenmod.tests.customtiles;
+
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+
+/**
+ * Created by Adnan on 4/29/15.
+ */
+public class DummySettings extends PreferenceActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+}