diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index e41262d99..3ef42317c 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -124,7 +124,6 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
     <input type="hidden" name="pg_cancel" value="0">
 
     <div class="tbl_head01 tbl_wrap">
-
         <table>
         <caption>주문 상품 목록</caption>
         <thead>
@@ -241,7 +240,6 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
         ?>
         </tbody>
         </table>
-
     </div>
 
     <div class="btn_list02 btn_list">
@@ -277,6 +275,10 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
 
 </section>
 
+<?php if($od['od_test']) { ?>
+<div>주의) 이 주문은 테스트용으로 실제 결제가 이루어지지 않았으므로 절대 배송하시면 안됩니다.</div>
+<?php } ?>
+
 <section id="anc_sodr_pay">
     <h2 class="h2_frm">주문결제 내역</h2>
     <?php echo $pg_anchor; ?>
diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index 93d90e579..78bd50c3d 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -245,7 +245,6 @@ if(!sql_query(" select mb_id from {$g5['g5_shop_order_delete_table']} limit 1 ",
             <label for="chkall" class="sound_only">주문 전체</label>
             <input type="checkbox" name="chkall" value="1" id="chkall" onclick="check_all(this.form)">
         </th>
-        <!-- <th scope="col" id="th_odrnum"><a href="<?php echo title_sort("od_id", 1)."&amp;$qstr1"; ?>">주문번호</a></th> -->
         <th scope="col" id="th_odrnum" rowspan="2" colspan="2"><a href="<?php echo title_sort("od_id", 1)."&amp;$qstr1"; ?>">주문번호</a></th>
         <th scope="col" id="th_odrer">주문자</th>
         <th scope="col" id="th_odrertel">주문자전화</th>
@@ -258,15 +257,11 @@ if(!sql_query(" select mb_id from {$g5['g5_shop_order_delete_table']} limit 1 ",
         <th scope="col" rowspan="3">보기</th>
     </tr>
     <tr>
-        <!-- <th scope="col" id="th_odrdate">주문일시</th> -->
-        <!-- <th scope="col">결제수단</th> -->
-        <!-- <th scope="col" id="th_odrid"><a href="<?php echo title_sort("mb_id")."&amp;$qstr1"; ?>">회원ID</a></th> -->
         <th scope="col" id="th_odrid">회원ID</th>
         <th scope="col" id="th_odrcnt">주문상품수</th>
         <th scope="col" id="th_odrall">누적주문수</th>
     </tr>
     <tr>
-        <!-- <th scope="col">배송일시</th> -->
         <th scope="col" id="odrstat">주문상태</th>
         <th scope="col" id="odrpay">결제수단</th>
         <th scope="col" id="delino">운송장번호</th>
@@ -339,8 +334,11 @@ if(!sql_query(" select mb_id from {$g5['g5_shop_order_delete_table']} limit 1 ",
 
         // 주문 번호에 에스크로 표시
         $od_paytype = '';
+        if($row['od_test'])
+            $od_paytype .= '<span class="list_test">테스트</span>';
+
         if($default['de_escrow_use'] && $row['od_escrow'])
-            $od_paytype = '<span class="list_escrow">에스크로</span>';
+            $od_paytype .= '<span class="list_escrow">에스크로</span>';
 
         $uid = md5($row['od_id'].$row['od_time'].$row['od_ip']);
 
@@ -360,10 +358,6 @@ if(!sql_query(" select mb_id from {$g5['g5_shop_order_delete_table']} limit 1 ",
             <label for="chk_<?php echo $i; ?>" class="sound_only">주문번호 <?php echo $row['od_id']; ?></label>
             <input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
         </td>
-        <!-- <td headers="th_ordnum" class="td_odrnum2">
-            <?php echo $od_mobile; ?>
-            <a href="<?php echo G5_SHOP_URL; ?>/orderinquiryview.php?od_id=<?php echo $row['od_id']; ?>&amp;uid=<?php echo $uid; ?>"><?php echo $row['od_id']; ?></a><br>
-        </td> -->
         <td headers="th_ordnum" class="td_odrnum2" rowspan="2" colspan="2">
             <a href="<?php echo G5_SHOP_URL; ?>/orderinquiryview.php?od_id=<?php echo $row['od_id']; ?>&amp;uid=<?php echo $uid; ?>" class="orderitem"><?php echo $disp_od_id; ?></a>
             <?php echo $od_mobile; ?>
@@ -382,12 +376,6 @@ if(!sql_query(" select mb_id from {$g5['g5_shop_order_delete_table']} limit 1 ",
         </td>
     </tr>
     <tr class="<?php echo $bg; ?>">
-        <!-- <td headers="th_odrdate"><span class="sound_only">주문일시 </span><?php echo $row['od_time']; ?></td> -->
-        <!-- <td class="td_payby">
-            <input type="hidden" name="current_settle_case[<?php echo $i ?>]" value="<?php echo $row['od_settle_case'] ?>">
-            <?php echo $s_receipt_way; ?>
-        </td> -->
-        <!-- <td headers="th_odrid" class="td_name"><a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>?sort1=<?php echo $sort1; ?>&amp;sort2=<?php echo $sort2; ?>&amp;sel_field=mb_id&amp;search=<?php echo $row['mb_id']; ?>"><?php echo $row['mb_id']; ?></a></td> -->
         <td headers="th_odrid">
             <?php if ($row['mb_id']) { ?>
             <a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>?sort1=<?php echo $sort1; ?>&amp;sort2=<?php echo $sort2; ?>&amp;sel_field=mb_id&amp;search=<?php echo $row['mb_id']; ?>"><?php echo $row['mb_id']; ?></a>
diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php
index c2be8484e..2979d3b46 100644
--- a/mobile/shop/orderformupdate.php
+++ b/mobile/shop/orderformupdate.php
@@ -565,7 +565,8 @@ $sql = " insert {$g5['g5_shop_order_table']}
                 od_time           = '".G5_TIME_YMDHIS."',
                 od_mobile         = '1',
                 od_ip             = '$REMOTE_ADDR',
-                od_settle_case    = '$od_settle_case'
+                od_settle_case    = '$od_settle_case',
+                od_test           = '{$default['de_card_test']}'
                 ";
 $result = sql_query($sql, false);
 
diff --git a/orderupgrade.php b/orderupgrade.php
index 9dae931a4..38c26d07a 100644
--- a/orderupgrade.php
+++ b/orderupgrade.php
@@ -88,6 +88,12 @@ if(!sql_query(" select P_AUTH_NO from {$g5['g5_shop_inicis_log_table']} limit 1
                     ADD `P_AUTH_NO` varchar(255) NOT NULL DEFAULT '' AFTER `P_FN_NM` ", true);
 }
 
+// 테스트 주문필드 추가
+if(!sql_query(" select od_test from {$g5['g5_shop_order_table']} limit 1 ", false)) {
+    sql_query(" ALTER TABLE `{$g5['g5_shop_order_table']}`
+                    ADD `od_test` tinyint(4) NOT NULL DEFAULT '0' AFTER `od_settle_case` ", true);
+}
+
 echo '<p>테이블 업그레이드 완료!</p>';
 
 include_once(G5_PATH.'/tail.sub.php');
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index 8ef214d37..f488e20ab 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -549,7 +549,8 @@ $sql = " insert {$g5['g5_shop_order_table']}
                 od_hope_date      = '$od_hope_date',
                 od_time           = '".G5_TIME_YMDHIS."',
                 od_ip             = '$REMOTE_ADDR',
-                od_settle_case    = '$od_settle_case'
+                od_settle_case    = '$od_settle_case',
+                od_test           = '{$default['de_card_test']}'
                 ";
 $result = sql_query($sql, false);
 
@@ -815,8 +816,10 @@ $uid = md5($od_id.G5_TIME_YMDHIS.$REMOTE_ADDR);
 set_session('ss_orderview_uid', $uid);
 
 // 주문 정보 임시 데이터 삭제
-$sql = " delete from {$g5['g5_shop_order_data_table']} where od_id = '$od_id' and dt_pg = '$od_pg' ";
-sql_query($sql);
+if($od_pg == 'inicis') {
+    $sql = " delete from {$g5['g5_shop_order_data_table']} where od_id = '$od_id' and dt_pg = '$od_pg' ";
+    sql_query($sql);
+}
 
 // 주문번호제거
 set_session('ss_order_id', '');