Index: branches/version-2_11-dev/test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php
===================================================================
--- branches/version-2_11-dev/test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php	(revision 20764)
+++ branches/version-2_11-dev/test/class/page/shopping/LC_Page_Shopping_LoadPaymentModule_Test.php	(revision 21186)
@@ -112,12 +112,12 @@
                                                    'customer_id' => (int) 0,
                                                    'payment_id' => $payment_id,
-                                                   'create_date' => 'now()',
-                                                   'update_date' => 'now()'));
+                                                   'create_date' => 'CURRENT_TIMESTAMP',
+                                                   'update_date' => 'CURRENT_TIMESTAMP'));
 
         $this->objQuery->insert("dtb_payment", array('payment_id' => $order_id,
                                                      'module_path' => $module_path,
                                                      'creator_id' => 1,
-                                                     'create_date' => 'now()',
-                                                     'update_date' => 'now()'));
+                                                     'create_date' => 'CURRENT_TIMESTAMP',
+                                                     'update_date' => 'CURRENT_TIMESTAMP'));
     }
 }
Index: branches/version-2_11-dev/test/class/db/SC_DB_DBFactory_Test.php
===================================================================
--- branches/version-2_11-dev/test/class/db/SC_DB_DBFactory_Test.php	(revision 20764)
+++ branches/version-2_11-dev/test/class/db/SC_DB_DBFactory_Test.php	(revision 21186)
@@ -93,5 +93,5 @@
             $expected = "SELECT COUNT(total) FROM dtb_order "
                        . "WHERE del_flg = 0 "
-                         . "AND to_char(create_date,'YYYY/MM/DD') = to_char(now() - interval '1 days','YYYY/MM/DD') "
+                         . "AND to_char(create_date,'YYYY/MM/DD') = to_char(CURRENT_TIMESTAMP - interval '1 days','YYYY/MM/DD') "
                          . "AND status <> " . ORDER_CANCEL;
             break;
@@ -122,5 +122,5 @@
                         . "WHERE del_flg = 0 "
                           . "AND to_char(create_date,'YYYY/MM') = ? "
-                          . "AND to_char(create_date,'YYYY/MM/DD') <> to_char(now(),'YYYY/MM/DD') "
+                          . "AND to_char(create_date,'YYYY/MM/DD') <> to_char(CURRENT_TIMESTAMP,'YYYY/MM/DD') "
                           . "AND status <> " . ORDER_CANCEL;
             break;
@@ -130,5 +130,5 @@
                        . "WHERE del_flg = 0 "
                          . "AND date_format(create_date, '%Y/%m') = ? "
-                         . "AND date_format(create_date, '%Y/%m/%d') <> date_format(now(), '%Y/%m/%d') "
+                         . "AND date_format(create_date, '%Y/%m/%d') <> date_format(CURRENT_TIMESTAMP, '%Y/%m/%d') "
                          . "AND status <> " . ORDER_CANCEL;
             break;
@@ -154,6 +154,6 @@
                        . "WHERE A.del_flg=0 "
                          . "AND B.del_flg = 0 "
-                         . "AND to_char(A.create_date, 'YYYY/MM/DD') = to_char(now() - interval '1 days','YYYY/MM/DD') "
-                         . "AND to_char(A.create_date,'YYYY/MM/DD') != to_char(now(),'YYYY/MM/DD')";
+                         . "AND to_char(A.create_date, 'YYYY/MM/DD') = to_char(CURRENT_TIMESTAMP - interval '1 days','YYYY/MM/DD') "
+                         . "AND to_char(A.create_date,'YYYY/MM/DD') != to_char(CURRENT_TIMESTAMP,'YYYY/MM/DD')";
             break;
 
