diff --git a/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp b/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
index 866776b78f..c3afea3f67 100644
--- a/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
+++ b/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
@@ -684,6 +684,7 @@ static void testSetFontSize(BView *view, BRect frame)
 
 static void testSetDrawingMode(BView *view, BRect frame)
 {
+	frame.InsetBy(2, 2);
 	view->StrokeLine(frame.LeftTop(), frame.RightBottom());
 	view->StrokeLine(frame.LeftBottom(), frame.RightTop());
 	view->SetDrawingMode(B_OP_ALPHA);
@@ -693,6 +694,17 @@ static void testSetDrawingMode(BView *view, BRect frame)
 	view->FillRect(frame, B_SOLID_HIGH);
 }
 
+static void testPushPopState(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	view->SetHighColor(kGreen);
+	view->PushState();
+	view->SetHighColor(kRed);
+	view->PopState();
+	
+	view->FillRect(frame, B_SOLID_HIGH);
+}
+
 
 // TODO
 // - blending mode
@@ -757,6 +769,7 @@ TestCase gTestCases[] = {
 	{ "Test SetOriginAndScale5", testSetOriginAndScale5 },
 	{ "Test SetFontSize", testSetFontSize },
 	{ "Test SetDrawingMode", testSetDrawingMode },
+	{ "Test PushPopState", testPushPopState },
 	{ NULL, NULL }
 };