diff --git a/airtime_mvc/tests/application/services/database/ShowServiceDbTest.php b/airtime_mvc/tests/application/services/database/ShowServiceDbTest.php
index ef82a1ae1..82b96920f 100644
--- a/airtime_mvc/tests/application/services/database/ShowServiceDbTest.php
+++ b/airtime_mvc/tests/application/services/database/ShowServiceDbTest.php
@@ -464,11 +464,11 @@ class ShowServiceDbTest extends Zend_Test_PHPUnit_DatabaseTestCase
         );
     }
 
-    /** Test the creation of a single record and rebroadcast show **/
+    /** Test the creation of a single record and rebroadcast(RR) show **/
     public function testCreateNoRepeatRRShow()
     {
         TestHelper::loginUser();
-        
+
         $data = ShowServiceData::getNoRepeatRRData();
         $showService = new Application_Service_ShowService(null, $data);
         $showService->addUpdateShow($data);
@@ -487,4 +487,28 @@ class ShowServiceDbTest extends Zend_Test_PHPUnit_DatabaseTestCase
             $ds
         );
     }
+
+    /** Test the creation of a weekly repeating, record and rebroadcast(RR) show **/
+    public function testCreateWeeklyRepeatRRShow()
+    {
+        TestHelper::loginUser();
+
+        $data = ShowServiceData::getWeeklyRepeatRRData();
+        $showService = new Application_Service_ShowService(null, $data);
+        $showService->addUpdateShow($data);
+
+        $ds = new Zend_Test_PHPUnit_Db_DataSet_QueryDataSet(
+                $this->getConnection()
+        );
+        $ds->addTable('cc_show', 'select * from cc_show');
+        $ds->addTable('cc_show_days', 'select * from cc_show_days');
+        $ds->addTable('cc_show_instances', 'select id, starts, ends, show_id, record, rebroadcast, instance_id, modified_instance from cc_show_instances');
+        $ds->addTable('cc_show_rebroadcast', 'select * from cc_show_rebroadcast');
+        $ds->addTable('cc_show_hosts', 'select * from cc_show_hosts');
+        
+        $this->assertDataSetsEqual(
+            $this->createXmlDataSet(dirname(__FILE__)."/datasets/test_createWeeklyRepeatRRShow.xml"),
+            $ds
+        );
+    }
 }
diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.xml b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.xml
new file mode 100644
index 000000000..b29bb7388
--- /dev/null
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.xml
@@ -0,0 +1,273 @@
+<?xml version="1.0" ?>
+<dataset>
+    <table name="cc_show">
+        <column>id</column>
+        <column>name</column>
+        <column>url</column>
+        <column>genre</column>
+        <column>description</column>
+        <column>color</column>
+        <column>background_color</column>
+        <column>live_stream_using_airtime_auth</column>
+        <column>live_stream_using_custom_auth</column>
+        <column>live_stream_user</column>
+        <column>live_stream_pass</column>
+        <column>linked</column>
+        <column>is_linkable</column>
+        <row>
+            <value>1</value>
+            <value>test show</value>
+            <null />
+            <null />
+            <null />
+            <value>ffffff</value>
+            <value>364492</value>
+            <value></value>
+            <value></value>
+            <null />
+            <null />
+            <value></value>
+            <value>1</value>
+        </row>
+   </table>
+
+  <table name="cc_show_days">
+        <column>id</column>
+        <column>first_show</column>
+        <column>last_show</column>
+        <column>start_time</column>
+        <column>timezone</column>
+        <column>duration</column>
+        <column>day</column>
+        <column>repeat_type</column>
+        <column>next_pop_date</column>
+        <column>show_id</column>
+        <column>record</column>
+        <row>
+            <value>1</value>
+            <value>2016-01-01</value>
+            <null />
+            <value>00:00:00</value>
+            <value>UTC</value>
+            <value>01:00</value>
+            <value>5</value>
+            <value>0</value>
+            <value>2016-02-12</value>
+            <value>1</value>
+            <value>1</value>
+        </row>
+    </table>
+
+    <table name="cc_show_instances">
+        <column>id</column>
+        <column>starts</column>
+        <column>ends</column>
+        <column>show_id</column>
+        <column>record</column>
+        <column>rebroadcast</column>
+        <column>instance_id</column>
+        <column>modified_instance</column>
+        <row>
+            <value>1</value>
+            <value>2016-01-01 00:00:00</value>
+            <value>2016-01-01 01:00:00</value>
+            <value>1</value>
+            <value>1</value>
+            <value>0</value>
+            <null />
+            <value></value>
+        </row>
+        <row>
+            <value>2</value>
+            <value>2016-01-02 00:00:00</value>
+            <value>2016-01-02 01:00:00</value>
+            <value>1</value>
+            <value>0</value>
+            <value>1</value>
+            <value>1</value>
+            <value></value>
+        </row>
+        <row>
+            <value>3</value>
+            <value>2016-01-03 12:00:00</value>
+            <value>2016-01-03 13:00:00</value>
+            <value>1</value>
+            <value>0</value>
+            <value>1</value>
+            <value>1</value>
+            <value></value>
+        </row>
+        <row>
+            <value>4</value>
+            <value>2016-01-08 00:00:00</value>
+            <value>2016-01-08 01:00:00</value>
+            <value>1</value>
+            <value>1</value>
+            <value>0</value>
+            <null />
+            <value></value>
+        </row>
+        <row>
+            <value>5</value>
+            <value>2016-01-09 00:00:00</value>
+            <value>2016-01-09 01:00:00</value>
+            <value>1</value>
+            <value>0</value>
+            <value>1</value>
+            <value>4</value>
+            <value></value>
+        </row>
+        <row>
+            <value>6</value>
+            <value>2016-01-10 12:00:00</value>
+            <value>2016-01-10 13:00:00</value>
+            <value>1</value>
+            <value>0</value>
+            <value>1</value>
+            <value>4</value>
+            <value></value>
+        </row>
+        <row>
+            <value>7</value>
+            <value>2016-01-15 00:00:00</value>
+            <value>2016-01-15 01:00:00</value>
+            <value>1</value>
+            <value>1</value>
+            <value>0</value>
+            <null />
+            <value></value>
+        </row>
+        <row>
+            <value>8</value>
+            <value>2016-01-16 00:00:00</value>
+            <value>2016-01-16 01:00:00</value>
+            <value>1</value>
+            <value>0</value>
+            <value>1</value>
+            <value>7</value>
+            <value></value>
+        </row>
+        <row>
+            <value>9</value>
+            <value>2016-01-17 12:00:00</value>
+            <value>2016-01-17 13:00:00</value>
+            <value>1</value>
+            <value>0</value>
+            <value>1</value>
+            <value>7</value>
+            <value></value>
+        </row>
+        <row>
+            <value>10</value>
+            <value>2016-01-22 00:00:00</value>
+            <value>2016-01-22 01:00:00</value>
+            <value>1</value>
+            <value>1</value>
+            <value>0</value>
+            <null />
+            <value></value>
+        </row>
+        <row>
+            <value>11</value>
+            <value>2016-01-23 00:00:00</value>
+            <value>2016-01-23 01:00:00</value>
+            <value>1</value>
+            <value>0</value>
+            <value>1</value>
+            <value>10</value>
+            <value></value>
+        </row>
+        <row>
+            <value>12</value>
+            <value>2016-01-24 12:00:00</value>
+            <value>2016-01-24 13:00:00</value>
+            <value>1</value>
+            <value>0</value>
+            <value>1</value>
+            <value>10</value>
+            <value></value>
+        </row>
+        <row>
+            <value>13</value>
+            <value>2016-01-29 00:00:00</value>
+            <value>2016-01-29 01:00:00</value>
+            <value>1</value>
+            <value>1</value>
+            <value>0</value>
+            <null />
+            <value></value>
+        </row>
+        <row>
+            <value>14</value>
+            <value>2016-01-30 00:00:00</value>
+            <value>2016-01-30 01:00:00</value>
+            <value>1</value>
+            <value>0</value>
+            <value>1</value>
+            <value>13</value>
+            <value></value>
+        </row>
+        <row>
+            <value>15</value>
+            <value>2016-01-31 12:00:00</value>
+            <value>2016-01-31 13:00:00</value>
+            <value>1</value>
+            <value>0</value>
+            <value>1</value>
+            <value>13</value>
+            <value></value>
+        </row>
+        <row>
+            <value>16</value>
+            <value>2016-02-05 00:00:00</value>
+            <value>2016-02-05 01:00:00</value>
+            <value>1</value>
+            <value>1</value>
+            <value>0</value>
+            <null />
+            <value></value>
+        </row>
+        <row>
+            <value>17</value>
+            <value>2016-02-06 00:00:00</value>
+            <value>2016-02-06 01:00:00</value>
+            <value>1</value>
+            <value>0</value>
+            <value>1</value>
+            <value>16</value>
+            <value></value>
+        </row>
+        <row>
+            <value>18</value>
+            <value>2016-02-07 12:00:00</value>
+            <value>2016-02-07 13:00:00</value>
+            <value>1</value>
+            <value>0</value>
+            <value>1</value>
+            <value>16</value>
+            <value></value>
+        </row>
+    </table>
+
+    <table name="cc_show_rebroadcast">
+        <column>id</column>
+        <column>day_offset</column>
+        <column>start_time</column>
+        <column>show_id</column>
+        <row>
+            <value>1</value>
+            <value>1 days</value>
+            <value>00:00:00</value>
+            <value>1</value>
+        </row>
+        <row>
+            <value>2</value>
+            <value>2 days</value>
+            <value>12:00:00</value>
+            <value>1</value>
+        </row>
+    </table>
+
+    <table name="cc_show_hosts">
+    </table>
+</dataset>
\ No newline at end of file
diff --git a/airtime_mvc/tests/application/testdata/ShowServiceData.php b/airtime_mvc/tests/application/testdata/ShowServiceData.php
index b6b067264..feb4e08c8 100644
--- a/airtime_mvc/tests/application/testdata/ShowServiceData.php
+++ b/airtime_mvc/tests/application/testdata/ShowServiceData.php
@@ -412,4 +412,79 @@ Class ShowServiceData
             "add_show_day_check" => null
         );
     }
+
+    public static function getWeeklyRepeatRRData()
+    {
+        return array(
+            "add_show_id" => -1,
+            "add_show_instance_id" => -1,
+            "add_show_name" => "test show",
+            "add_show_url" => null,
+            "add_show_genre" => null,
+            "add_show_description" => null,
+            "add_show_start_date" => "2016-01-01",
+            "add_show_start_time" => "00:00",
+            "add_show_end_date_no_repeat" => "2016-01-01",
+            "add_show_end_time" => "01:00",
+            "add_show_duration" => "01h 00m",
+            "add_show_timezone" => "UTC",
+            "add_show_repeats" => 1,
+            "add_show_linked" => 0,
+            "add_show_repeat_type" => 0,
+            "add_show_monthly_repeat_type" => 2,
+            "add_show_end_date" => "2016-01-01",
+            "add_show_no_end" => 1,
+            "cb_airtime_auth" => 0,
+            "cb_custom_auth" => 0,
+            "custom_username" => null,
+            "custom_password" => null,
+            "add_show_record" => 1,
+            "add_show_rebroadcast" => 1,
+            "add_show_rebroadcast_date_absolute_1" => null,
+            "add_show_rebroadcast_time_absolute_1" => null,
+            "add_show_rebroadcast_date_absolute_2" => null,
+            "add_show_rebroadcast_time_absolute_2" => null,
+            "add_show_rebroadcast_date_absolute_3" => null,
+            "add_show_rebroadcast_time_absolute_3" => null,
+            "add_show_rebroadcast_date_absolute_4" => null,
+            "add_show_rebroadcast_time_absolute_4" => null,
+            "add_show_rebroadcast_date_absolute_5" => null,
+            "add_show_rebroadcast_time_absolute_5" => null,
+            "add_show_rebroadcast_date_absolute_6" => null,
+            "add_show_rebroadcast_time_absolute_6" => null,
+            "add_show_rebroadcast_date_absolute_7" => null,
+            "add_show_rebroadcast_time_absolute_7" => null,
+            "add_show_rebroadcast_date_absolute_8" => null,
+            "add_show_rebroadcast_time_absolute_8" => null,
+            "add_show_rebroadcast_date_absolute_9" => null,
+            "add_show_rebroadcast_time_absolute_9" => null,
+            "add_show_rebroadcast_date_absolute_10" => null,
+            "add_show_rebroadcast_time_absolute_10" => null,
+            "add_show_rebroadcast_date_1" => "1 days",
+            "add_show_rebroadcast_time_1" => "00:00",
+            "add_show_rebroadcast_date_2" => "2 days",
+            "add_show_rebroadcast_time_2" => "12:00",
+            "add_show_rebroadcast_date_3" => null,
+            "add_show_rebroadcast_time_3" => null,
+            "add_show_rebroadcast_date_4" => null,
+            "add_show_rebroadcast_time_4" => null,
+            "add_show_rebroadcast_date_5" => null,
+            "add_show_rebroadcast_time_5" => null,
+            "add_show_rebroadcast_date_6" => null,
+            "add_show_rebroadcast_time_6" => null,
+            "add_show_rebroadcast_date_7" => null,
+            "add_show_rebroadcast_time_7" => null,
+            "add_show_rebroadcast_date_8" => null,
+            "add_show_rebroadcast_time_8" => null,
+            "add_show_rebroadcast_date_9" => null,
+            "add_show_rebroadcast_time_9" => null,
+            "add_show_rebroadcast_date_10" => null,
+            "add_show_rebroadcast_time_10" => null,
+            "add_show_hosts_autocomplete" => null,
+            "add_show_background_color" => "364492",
+            "add_show_color" => "ffffff",
+            "add_show_hosts" => null,
+            "add_show_day_check" => array(5)
+        );
+    }
 }
\ No newline at end of file