diff --git a/gsdevkit/bin/upgradePrepareGsDevKitImage_3215 b/gsdevkit/bin/upgradePrepareGsDevKitImage_3215
index 897856f..fa83285 100755
--- a/gsdevkit/bin/upgradePrepareGsDevKitImage_3215
+++ b/gsdevkit/bin/upgradePrepareGsDevKitImage_3215
@@ -25,9 +25,11 @@ pushd "${upgradeLogDir}" >& /dev/null
 	startTopaz $GEMSTONE_NAME -lq < $GS_HOME/shared/repos/GsDevKit_upgradeDevKitImage/bin/prepareGsDevKitImage_pragma_user
 	startTopaz $GEMSTONE_NAME -lq < $GS_HOME/shared/repos/GsDevKit_upgradeDevKitImage/bin/prepareGsDevKitImage_pragma_SystemUser
 	startTopaz $GEMSTONE_NAME -lq -T 500000 < $GS_HOME/shared/repos/GsDevKit_upgradeDevKitImage/bin/prepareGsDevKitImage_user
+
+	stopStone $GEMSTONE_NAME
+	cp ../extents/extent0.dbf ../snapshots/extent0_preparedGsDevKitImage_3215.dbf
+	startStone $GEMSTONE_NAME
+
 	startTopaz $GEMSTONE_NAME -lq < $GS_HOME/shared/repos/GsDevKit_upgradeDevKitImage/bin/runImageTests
 popd
 
- stopStone $GEMSTONE_NAME
- cp extents/extent0.dbf snapshots/extent0_preparedGsDevKitImage_3215.dbf
-
diff --git a/gsdevkit/bin/upgradePrepareGsDevKitImage_339 b/gsdevkit/bin/upgradePrepareGsDevKitImage_339
index 4495f41..ab299ac 100755
--- a/gsdevkit/bin/upgradePrepareGsDevKitImage_339
+++ b/gsdevkit/bin/upgradePrepareGsDevKitImage_339
@@ -25,9 +25,12 @@ pushd "${upgradeLogDir}" >& /dev/null
 	startTopaz $GEMSTONE_NAME -lq < $GS_HOME/shared/repos/GsDevKit_upgradeDevKitImage/bin/prepareGsDevKitImage_pragma_user
 	startTopaz $GEMSTONE_NAME -lq < $GS_HOME/shared/repos/GsDevKit_upgradeDevKitImage/bin/prepareGsDevKitImage_pragma_SystemUser
 	startTopaz $GEMSTONE_NAME -lq -T 500000 < $GS_HOME/shared/repos/GsDevKit_upgradeDevKitImage/bin/prepareGsDevKitImage_user
+
+	stopStone $GEMSTONE_NAME
+	cp ../extents/extent0.dbf ../snapshots/extent0_preparedGsDevKitImage_339.dbf
+	startStone $GEMSTONE_NAME
+
 	startTopaz $GEMSTONE_NAME -lq < $GS_HOME/shared/repos/GsDevKit_upgradeDevKitImage/bin/runImageTests
 popd
 
- stopStone $GEMSTONE_NAME
- cp extents/extent0.dbf snapshots/extent0_preparedGsDevKitImage_339.dbf
 
diff --git a/gsdevkit/bin/upgradePrepareGsDevKitImage_343 b/gsdevkit/bin/upgradePrepareGsDevKitImage_343
index 01d215b..82aaff9 100755
--- a/gsdevkit/bin/upgradePrepareGsDevKitImage_343
+++ b/gsdevkit/bin/upgradePrepareGsDevKitImage_343
@@ -25,9 +25,12 @@ pushd "${upgradeLogDir}" >& /dev/null
 	startTopaz $GEMSTONE_NAME -lq < $GS_HOME/shared/repos/GsDevKit_upgradeDevKitImage/bin/prepareGsDevKitImage_pragma_user
 	startTopaz $GEMSTONE_NAME -lq < $GS_HOME/shared/repos/GsDevKit_upgradeDevKitImage/bin/prepareGsDevKitImage_pragma_SystemUser
 	startTopaz $GEMSTONE_NAME -lq -T 500000 < $GS_HOME/shared/repos/GsDevKit_upgradeDevKitImage/bin/prepareGsDevKitImage_user
+
+	stopStone $GEMSTONE_NAME
+	cp ../extents/extent0.dbf ../snapshots/extent0_preparedGsDevKitImage_343.dbf
+	startStone $GEMSTONE_NAME
+
 	startTopaz $GEMSTONE_NAME -lq < $GS_HOME/shared/repos/GsDevKit_upgradeDevKitImage/bin/runImageTests
 popd
 
- stopStone $GEMSTONE_NAME
- cp extents/extent0.dbf snapshots/extent0_preparedGsDevKitImage_343.dbf