diff --git a/redash/query_runner/presto.py b/redash/query_runner/presto.py
index d9f700cad..ba879c9e1 100644
--- a/redash/query_runner/presto.py
+++ b/redash/query_runner/presto.py
@@ -17,6 +17,8 @@ except ImportError:
 
 PRESTO_TYPES_MAPPING = {
     "integer": TYPE_INTEGER,
+    "tinyint": TYPE_INTEGER,
+    "smallint": TYPE_INTEGER,
     "long": TYPE_INTEGER,
     "bigint": TYPE_INTEGER,
     "float": TYPE_FLOAT,