diff --git a/test/viewport/test.js b/test/viewport/test.js
index df83811..89148cf 100644
--- a/test/viewport/test.js
+++ b/test/viewport/test.js
@@ -1,8 +1,16 @@
 function execute(){
   var PagingList = $( '#list-paging' ).lu( 'getComponent', 'List' ),
+    PagingListPrevButton = $( '#list-paging-prev'),
+    PagingListNextButton = $( '#list-paging-next'),
     SlidingList = $( '#list-sliding' ).lu( 'getComponent', 'List' ),
+    SlidingListPrevButton = $( '#list-sliding-prev'),
+    SlidingListNextButton = $( '#list-sliding-next'),
     PagingCarousel = $( '#carousel-paging' ).lu( 'getComponent', 'Carousel' ),
-    SlidingCarousel = $( '#carousel-sliding' ).lu( 'getComponent', 'Carousel' );
+    PagingCarouselPrevButton = $( '#carousel-paging-prev'),
+    PagingCarouselNextButton = $( '#carousel-paging-next'),
+    SlidingCarousel = $( '#carousel-sliding' ).lu( 'getComponent', 'Carousel' ),
+    SlidingCarouselPrevButton = $( '#carousel-sliding-prev'),
+    SlidingCarouselNextButton = $( '#carousel-sliding-next');
 
   QUnit.module( 'List Viewport Decorator Test' );
 
@@ -18,8 +26,21 @@ function execute(){
       PagingList.instance.trigger('previous');
       ok(PagingList.instance.index() === 0);
       ok(PagingList.instance.hasPrevious() === false);
-      start();
-    });
+
+      PagingListNextButton.lu('getComponent','Button').ready(function() {
+        PagingList.instance.select(0);
+        PagingListNextButton.click();
+        ok(PagingList.instance.index() === 5);
+      }); 
+      PagingListPrevButton.lu('getComponent','Button').ready(function() {
+        PagingList.instance.select(5);
+        PagingListPrevButton.click();
+        ok(PagingList.instance.index() === 0);
+        start(); 
+      });   
+  });
+
+    
   } );
 
   QUnit.asyncTest( 'sliding', function(){
@@ -35,7 +56,18 @@ function execute(){
       ok(SlidingList.instance.index() === 12);
       ok(SlidingList.instance.hasNext() === true);
       ok(SlidingList.instance.hasPrevious() === true);
-      start();
+
+      SlidingListNextButton.lu('getComponent','Button').ready(function() {
+        SlidingList.instance.select(0);
+        SlidingListNextButton.click();
+        ok(SlidingList.instance.index() === 1);
+      }); 
+      SlidingListPrevButton.lu('getComponent','Button').ready(function() {
+        SlidingList.instance.select(1);
+        SlidingListPrevButton.click();
+        ok(SlidingList.instance.index() === 0); 
+        start(); 
+      }); 
     });
   } );
 
@@ -53,7 +85,18 @@ function execute(){
       ok(PagingCarousel.instance.hasPrevious() === true);
       PagingCarousel.instance.trigger('previous');
       ok(PagingCarousel.instance.index() === 9);
-      start();
+
+      PagingCarouselNextButton.lu('getComponent','Button').ready(function() {
+        PagingCarousel.instance.select(0);
+        PagingCarouselPrevButton.click();
+        ok(PagingCarousel.instance.index() === 9);
+      }); 
+      PagingCarouselPrevButton.lu('getComponent','Button').ready(function() {
+        PagingCarousel.instance.select(9);
+        PagingCarouselNextButton.click();
+        ok(PagingCarousel.instance.index() === 0);
+        start(); 
+      }); 
     });
   } );
 
@@ -70,7 +113,18 @@ function execute(){
       ok(SlidingCarousel.instance.hasPrevious() === true);
       SlidingCarousel.instance.trigger('previous');
       ok(SlidingCarousel.instance.index() == 13);
-      start();
+      
+      SlidingCarouselNextButton.lu('getComponent','Button').ready(function() {
+        SlidingCarousel.instance.select(0);
+        SlidingCarouselPrevButton.click();
+        ok(SlidingCarousel.instance.index() === 13);
+      }); 
+      SlidingCarouselPrevButton.lu('getComponent','Button').ready(function() {
+        SlidingCarousel.instance.select(13);
+        SlidingCarouselNextButton.click();
+        ok(SlidingCarousel.instance.index() === 0);
+        start(); 
+      }); 
     });
   } );
 }
diff --git a/test/viewport/viewport.html b/test/viewport/viewport.html
index 916a5a5..d0faf32 100644
--- a/test/viewport/viewport.html
+++ b/test/viewport/viewport.html
@@ -94,8 +94,8 @@
       <li>13</li>
     </ul>
     <div class="controls">
-      <button data-lu="Button:Previous">Previous</button>
-      <button data-lu="Button:Next">Next</button>
+      <button id="list-paging-prev" data-lu="Button:Previous">Previous</button>
+      <button id="list-paging-next" data-lu="Button:Next">Next</button>
     </div>
   </div>
 
@@ -126,8 +126,8 @@
       <li>13</li>
     </ul>
     <div class="controls">
-      <button class="button-previous" data-lu="Button:Previous">Previous</button>
-      <button class="button-next" data-lu="Button:Next">Next</button>
+      <button id="list-sliding-prev" class="button-previous" data-lu="Button:Previous">Previous</button>
+      <button id="list-sliding-next" class="button-next" data-lu="Button:Next">Next</button>
     </div>
   </div>
 
@@ -160,8 +160,8 @@
       <li>13</li>
     </ul>
     <div class="controls">
-      <button data-lu="Button:Previous">Previous</button>
-      <button data-lu="Button:Next">Next</button>
+      <button id="carousel-paging-prev"data-lu="Button:Previous">Previous</button>
+      <button id="carousel-paging-next" data-lu="Button:Next">Next</button>
     </div>
   </div>
 
@@ -188,8 +188,8 @@
       <li>13</li>
     </ul>
     <div class="controls">
-      <button data-lu="Button:Previous">Previous</button>
-      <button data-lu="Button:Next">Next</button>
+      <button id="carousel-sliding-prev" data-lu="Button:Previous">Previous</button>
+      <button id="carousel-sliding-next" data-lu="Button:Next">Next</button>
     </div>
   </div>