diff --git a/pkg/tsdb/mssql/macros.go b/pkg/tsdb/mssql/macros.go
index a99e6e41557..ec3f103a4ef 100644
--- a/pkg/tsdb/mssql/macros.go
+++ b/pkg/tsdb/mssql/macros.go
@@ -102,9 +102,9 @@ func (m *msSqlMacroEngine) evaluateMacro(name string, args []string) (string, er
 		}
 		return fmt.Sprintf("%s >= %d AND %s <= %d", args[0], m.timeRange.GetFromAsTimeUTC().UnixNano(), args[0], m.timeRange.GetToAsTimeUTC().UnixNano()), nil
 	case "__unixEpochNanoFrom":
-		return fmt.Sprintf("'%d'", m.timeRange.GetFromAsTimeUTC().UnixNano()), nil
+		return fmt.Sprintf("%d", m.timeRange.GetFromAsTimeUTC().UnixNano()), nil
 	case "__unixEpochNanoTo":
-		return fmt.Sprintf("'%d'", m.timeRange.GetToAsTimeUTC().UnixNano()), nil
+		return fmt.Sprintf("%d", m.timeRange.GetToAsTimeUTC().UnixNano()), nil
 	case "__unixEpochGroup":
 		if len(args) < 2 {
 			return "", fmt.Errorf("macro %v needs time column and interval and optional fill value", name)
diff --git a/pkg/tsdb/mssql/macros_test.go b/pkg/tsdb/mssql/macros_test.go
index 311bffe3bcb..829a8b1ff1a 100644
--- a/pkg/tsdb/mssql/macros_test.go
+++ b/pkg/tsdb/mssql/macros_test.go
@@ -142,14 +142,14 @@ func TestMacroEngine(t *testing.T) {
 				sql, err := engine.Interpolate(query, timeRange, "select $__unixEpochNanoFrom()")
 				So(err, ShouldBeNil)
 
-				So(sql, ShouldEqual, fmt.Sprintf("select '%d'", from.UnixNano()))
+				So(sql, ShouldEqual, fmt.Sprintf("select %d", from.UnixNano()))
 			})
 
 			Convey("interpolate __unixEpochNanoTo function", func() {
 				sql, err := engine.Interpolate(query, timeRange, "select $__unixEpochNanoTo()")
 				So(err, ShouldBeNil)
 
-				So(sql, ShouldEqual, fmt.Sprintf("select '%d'", to.UnixNano()))
+				So(sql, ShouldEqual, fmt.Sprintf("select %d", to.UnixNano()))
 			})
 
 			Convey("interpolate __unixEpochGroup function", func() {
diff --git a/pkg/tsdb/postgres/macros.go b/pkg/tsdb/postgres/macros.go
index c51a11877d5..fbba582c262 100644
--- a/pkg/tsdb/postgres/macros.go
+++ b/pkg/tsdb/postgres/macros.go
@@ -128,9 +128,9 @@ func (m *postgresMacroEngine) evaluateMacro(name string, args []string) (string,
 		}
 		return fmt.Sprintf("%s >= %d AND %s <= %d", args[0], m.timeRange.GetFromAsTimeUTC().UnixNano(), args[0], m.timeRange.GetToAsTimeUTC().UnixNano()), nil
 	case "__unixEpochNanoFrom":
-		return fmt.Sprintf("'%d'", m.timeRange.GetFromAsTimeUTC().UnixNano()), nil
+		return fmt.Sprintf("%d", m.timeRange.GetFromAsTimeUTC().UnixNano()), nil
 	case "__unixEpochNanoTo":
-		return fmt.Sprintf("'%d'", m.timeRange.GetToAsTimeUTC().UnixNano()), nil
+		return fmt.Sprintf("%d", m.timeRange.GetToAsTimeUTC().UnixNano()), nil
 	case "__unixEpochGroup":
 		if len(args) < 2 {
 			return "", fmt.Errorf("macro %v needs time column and interval and optional fill value", name)
diff --git a/pkg/tsdb/postgres/macros_test.go b/pkg/tsdb/postgres/macros_test.go
index ceb418fbfed..eb14656c546 100644
--- a/pkg/tsdb/postgres/macros_test.go
+++ b/pkg/tsdb/postgres/macros_test.go
@@ -125,14 +125,14 @@ func TestMacroEngine(t *testing.T) {
 				sql, err := engine.Interpolate(query, timeRange, "select $__unixEpochNanoFrom()")
 				So(err, ShouldBeNil)
 
-				So(sql, ShouldEqual, fmt.Sprintf("select '%d'", from.UnixNano()))
+				So(sql, ShouldEqual, fmt.Sprintf("select %d", from.UnixNano()))
 			})
 
 			Convey("interpolate __unixEpochNanoTo function", func() {
 				sql, err := engine.Interpolate(query, timeRange, "select $__unixEpochNanoTo()")
 				So(err, ShouldBeNil)
 
-				So(sql, ShouldEqual, fmt.Sprintf("select '%d'", to.UnixNano()))
+				So(sql, ShouldEqual, fmt.Sprintf("select %d", to.UnixNano()))
 			})
 
 			Convey("interpolate __unixEpochGroup function", func() {