diff --git a/tests/test-snowflake-box.py b/tests/test-snowflake-box.py
new file mode 100755
index 00000000..757fd2b7
--- /dev/null
+++ b/tests/test-snowflake-box.py
@@ -0,0 +1,51 @@
+#!/usr/bin/python
+import pygtk
+pygtk.require('2.0')
+import gobject
+
+from sugar.session.UITestSession import UITestSession
+
+session = UITestSession()
+session.start()
+
+import sys
+import random
+
+import gtk
+import hippo
+
+from sugar.graphics.snowflakelayout import SnowflakeLayout
+from sugar.graphics.iconcolor import IconColor
+from sugar.graphics.canvasicon import CanvasIcon
+
+def _create_snowflake(parent, children):
+	color = IconColor()
+	icon = CanvasIcon(size=40, color=color,
+					  icon_name='activity-groupchat')
+	parent.append(icon, hippo.PACK_FIXED)
+	parent.set_root(icon)
+
+	for i in range(0, children):
+		color = IconColor()
+		icon = CanvasIcon(size=60, color=color,
+						  icon_name='stock-buddy')
+		parent.append(icon, hippo.PACK_FIXED)
+
+window = gtk.Window()
+window.connect("destroy", lambda w: gtk.main_quit())
+window.show()
+
+canvas = hippo.Canvas()
+
+root_box = hippo.CanvasBox(background_color=0xe2e2e2ff)
+canvas.set_root(root_box)
+root_box.spread()
+
+box = SnowflakeBox()
+snow_flake = _create_snowflake(box, 30)
+root_box.append(box)
+
+canvas.show()
+window.add(canvas)
+
+gtk.main()
diff --git a/tests/test-snowflake.py b/tests/test-snowflake.py
deleted file mode 100755
index 022cfe2b..00000000
--- a/tests/test-snowflake.py
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/python
-import pygtk
-pygtk.require('2.0')
-import gobject
-
-from sugar.session.UITestSession import UITestSession
-
-session = UITestSession()
-session.start()
-
-import sys
-import random
-
-import gtk
-import goocanvas
-
-from sugar.graphics.snowflakelayout import SnowflakeLayout
-from sugar.graphics import IconColor
-from sugar.graphics.IconItem import IconItem
-from sugar.graphics.CanvasView import CanvasView
-from sugar.graphics.Grid import Grid
-
-def _create_snowflake(group, children):
-	color = IconColor.IconColor()
-	icon = IconItem(size=40, color=color,
-					icon_name='activity-groupchat')
-	group.add_child(icon)
-	layout.set_root(icon)
-
-	for i in range(0, children):
-		color = IconColor.IconColor()
-		icon = IconItem(size=60, color=color,
-						icon_name='stock-buddy')
-		group.add_child(icon)
-		layout.add_child(icon)
-
-window = gtk.Window()
-window.connect("destroy", lambda w: gtk.main_quit())
-window.show()
-
-canvas = CanvasView()
-canvas.show()
-window.add(canvas)
-
-canvas_model = goocanvas.CanvasModelSimple()
-root = canvas_model.get_root_item()
-
-item = goocanvas.Rect(x=0, y=0, width=1200, height=900,
-                      line_width=0.0, fill_color='#e2e2e2')
-root.add_child(item)
-
-layout = SnowflakeLayout()
-group = goocanvas.Group()
-snow_flake = _create_snowflake(group, 30)
-root.add_child(group)
-
-layout = SnowflakeLayout()
-group = goocanvas.Group()
-group.translate(500, 500)
-_create_snowflake(group, 8)
-root.add_child(group)
-
-layout = SnowflakeLayout()
-group = goocanvas.Group()
-group.translate(20, 500)
-_create_snowflake(group, 2)
-root.add_child(group)
-
-canvas.set_model(canvas_model)
-
-gtk.main()