-

diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/AlterTableTests.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/AlterTableTests.java
index 24b122b..7a49b34 100644
--- a/presto-product-tests/src/main/java/com/facebook/presto/tests/AlterTableTests.java
+++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/AlterTableTests.java
@@ -14,6 +14,8 @@
 package com.facebook.presto.tests;
 
 import com.facebook.presto.tests.ImmutableTpchTablesRequirements.ImmutableNationTable;
+import com.teradata.tempto.AfterTestWithContext;
+import com.teradata.tempto.BeforeTestWithContext;
 import com.teradata.tempto.ProductTest;
 import com.teradata.tempto.Requires;
 import org.testng.annotations.Test;
@@ -30,73 +32,61 @@ import static java.lang.String.format;
 public class AlterTableTests
         extends ProductTest
 {
-    @Test(groups = {ALTER_TABLE, SMOKE})
-    public void renameTable()
-    {
-        String tableName = "to_be_renamed";
-        String renamedTableName = "renamed_table_name";
+    private static final String tableName = "tableName";
+    private static final String renamedTableName = "renamed_table_name";
 
+    @BeforeTestWithContext
+    @AfterTestWithContext
+    public void dropTestTables()
+    {
         query(format("DROP TABLE IF EXISTS %s", tableName));
         query(format("DROP TABLE IF EXISTS %s", renamedTableName));
+    }
 
-        try {
-            query(format("CREATE TABLE %s AS SELECT * FROM nation", tableName));
+    @Test(groups = {ALTER_TABLE, SMOKE})
+    public void renameTable()
+    {
+        query(format("CREATE TABLE %s AS SELECT * FROM nation", tableName));
 
-            assertThat(query(format("ALTER TABLE %s RENAME TO %s", tableName, renamedTableName), UPDATE))
-                    .hasRowsCount(1);
+        assertThat(query(format("ALTER TABLE %s RENAME TO %s", tableName, renamedTableName), UPDATE))
+                .hasRowsCount(1);
 
-            assertThat(query(format("SELECT * FROM %s", renamedTableName)))
-                    .hasRowsCount(25);
+        assertThat(query(format("SELECT * FROM %s", renamedTableName)))
+                .hasRowsCount(25);
 
-            // rename back to original name
-            assertThat(query(format("ALTER TABLE %s RENAME TO %s", renamedTableName, tableName), UPDATE))
-                    .hasRowsCount(1);
-        }
-        finally {
-            query(format("DROP TABLE %s", tableName));
-        }
+        // rename back to original name
+        assertThat(query(format("ALTER TABLE %s RENAME TO %s", renamedTableName, tableName), UPDATE))
+                .hasRowsCount(1);
     }
 
     @Test(groups = {ALTER_TABLE, SMOKE})
     public void renameColumn()
     {
-        String tableName = "tableName";
-        try {
-            query(format("CREATE TABLE %s AS SELECT * FROM nation", tableName));
-            assertThat(query(format("ALTER TABLE %s RENAME COLUMN n_nationkey TO nationkey", tableName), UPDATE))
-                    .hasRowsCount(1);
-            assertThat(query(format("SELECT count(nationkey) FROM %s", tableName)))
-                    .containsExactly(row(25));
-            assertThat(() -> query(format("ALTER TABLE %s RENAME COLUMN nationkey TO nATIoNkEy", tableName)))
-                    .failsWithMessage("Column 'nationkey' already exists");
-            assertThat(() -> query(format("ALTER TABLE %s RENAME COLUMN nationkey TO n_regionkeY", tableName)))
-                    .failsWithMessage("Column 'n_regionkey' already exists");
+        query(format("CREATE TABLE %s AS SELECT * FROM nation", tableName));
+        assertThat(query(format("ALTER TABLE %s RENAME COLUMN n_nationkey TO nationkey", tableName), UPDATE))
+                .hasRowsCount(1);
+        assertThat(query(format("SELECT count(nationkey) FROM %s", tableName)))
+                .containsExactly(row(25));
+        assertThat(() -> query(format("ALTER TABLE %s RENAME COLUMN nationkey TO nATIoNkEy", tableName)))
+                .failsWithMessage("Column 'nationkey' already exists");
+        assertThat(() -> query(format("ALTER TABLE %s RENAME COLUMN nationkey TO n_regionkeY", tableName)))
+                .failsWithMessage("Column 'n_regionkey' already exists");
 
-            assertThat(query(format("ALTER TABLE %s RENAME COLUMN nationkey TO n_nationkey", tableName)));
-        }
-        finally {
-            query(format("DROP TABLE %s", tableName));
-        }
+        assertThat(query(format("ALTER TABLE %s RENAME COLUMN nationkey TO n_nationkey", tableName)));
     }
 
     @Test(groups = {ALTER_TABLE, SMOKE})
     public void addColumn()
     {
-        String tableName = "tableName";
-        try {
-            query(format("CREATE TABLE %s AS SELECT * FROM nation", tableName));
+        query(format("CREATE TABLE %s AS SELECT * FROM nation", tableName));
 
-            assertThat(query(format("SELECT count(1) FROM %s", tableName)))
-                    .containsExactly(row(25));
-            assertThat(query(format("ALTER TABLE %s ADD COLUMN some_new_column BIGINT", tableName)))
-                    .hasRowsCount(1);
-            assertThat(() -> query(format("ALTER TABLE %s ADD COLUMN n_nationkey BIGINT", tableName)))
-                    .failsWithMessage("Column 'n_nationkey' already exists");
-            assertThat(() -> query(format("ALTER TABLE %s ADD COLUMN n_naTioNkEy BIGINT", tableName)))
-                    .failsWithMessage("Column 'n_naTioNkEy' already exists");
-        }
-        finally {
-            query(format("DROP TABLE %s", tableName));
-        }
+        assertThat(query(format("SELECT count(1) FROM %s", tableName)))
+                .containsExactly(row(25));
+        assertThat(query(format("ALTER TABLE %s ADD COLUMN some_new_column BIGINT", tableName)))
+                .hasRowsCount(1);
+        assertThat(() -> query(format("ALTER TABLE %s ADD COLUMN n_nationkey BIGINT", tableName)))
+                .failsWithMessage("Column 'n_nationkey' already exists");
+        assertThat(() -> query(format("ALTER TABLE %s ADD COLUMN n_naTioNkEy BIGINT", tableName)))
+                .failsWithMessage("Column 'n_naTioNkEy' already exists");
     }
 }