diff --git a/data/tariffplans/testtp/ActionTriggers.csv b/data/tariffplans/testtp/ActionTriggers.csv
index 795ef6ab8..8a1c88cac 100644
--- a/data/tariffplans/testtp/ActionTriggers.csv
+++ b/data/tariffplans/testtp/ActionTriggers.csv
@@ -2,6 +2,7 @@
 STANDARD_TRIGGERS,,*min_balance,2,false,0,,,,*monetary,*out,,,,,,,,,,,LOG_BALANCE,10
 STANDARD_TRIGGERS,,*max_balance,20,false,0,,,,*monetary,*out,,,,,,,,,,,LOG_BALANCE,10
 STANDARD_TRIGGERS,,*max_event_counter,15,false,0,,,,*monetary,*out,,FS_USERS,,,,,,,,,LOG_BALANCE,10
+STANDARD_TRIGGERS,,*max_balance_counter,1,false,0,,,,*monetary,*out,,,,,,,,,,,LOG_BALANCE,10
 CDRST1_WARN_ASR,,*min_asr,45,true,1h,,,,,,,,,,,,,,,3,CDRST_WARN_HTTP,10
 CDRST1_WARN_ACD,,*min_acd,10,true,1h,,,,,,,,,,,,,,,5,CDRST_WARN_HTTP,10
 CDRST1_WARN_ACC,,*max_acc,10,true,10m,,,,,,,,,,,,,,,5,CDRST_WARN_HTTP,10
diff --git a/general_tests/tp_it_test.go b/general_tests/tp_it_test.go
new file mode 100644
index 000000000..3eef405e1
--- /dev/null
+++ b/general_tests/tp_it_test.go
@@ -0,0 +1,119 @@
+package general_tests
+
+import (
+	"net/rpc"
+	"net/rpc/jsonrpc"
+	"path"
+	"testing"
+	"time"
+
+	"github.com/cgrates/cgrates/config"
+	"github.com/cgrates/cgrates/engine"
+	"github.com/cgrates/cgrates/utils"
+)
+
+var tpCfgPath string
+var tpCfg *config.CGRConfig
+var tpRPC *rpc.Client
+var tpLoadInst engine.LoadInstance // Share load information between tests
+
+func TestTpInitCfg(t *testing.T) {
+	if !*testIntegration {
+		return
+	}
+	tpCfgPath = path.Join(*dataDir, "conf", "samples", "tutlocal")
+	// Init config first
+	var err error
+	tpCfg, err = config.NewCGRConfigFromFolder(tpCfgPath)
+	if err != nil {
+		t.Error(err)
+	}
+	tpCfg.DataFolderPath = *dataDir // Share DataFolderPath through config towards StoreDb for Flush()
+	config.SetCgrConfig(tpCfg)
+}
+
+// Remove data in both rating and accounting db
+func TestTpResetDataDb(t *testing.T) {
+	if !*testIntegration {
+		return
+	}
+	if err := engine.InitDataDb(tpCfg); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// Wipe out the cdr database
+func TestTpResetStorDb(t *testing.T) {
+	if !*testIntegration {
+		return
+	}
+	if err := engine.InitStorDb(tpCfg); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// Start CGR Engine
+func TestTpStartEngine(t *testing.T) {
+	if !*testIntegration {
+		return
+	}
+	if _, err := engine.StopStartEngine(tpCfgPath, *waitRater); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// Connect rpc client to rater
+func TestTpRpcConn(t *testing.T) {
+	if !*testIntegration {
+		return
+	}
+	var err error
+	tpRPC, err = jsonrpc.Dial("tcp", tpCfg.RPCJSONListen) // We connect over JSON so we can also troubleshoot if needed
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+// Load the tariff plan, creating accounts and their balances
+func TestTpLoadTariffPlanFromFolder(t *testing.T) {
+	if !*testIntegration {
+		return
+	}
+	attrs := &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "testtp")}
+	if err := tpRPC.Call("ApierV2.LoadTariffPlanFromFolder", attrs, &tpLoadInst); err != nil {
+		t.Error(err)
+	} else if tpLoadInst.LoadId == "" {
+		t.Error("Empty loadId received, loadInstance: ", tpLoadInst)
+	}
+	time.Sleep(time.Duration(*waitRater) * time.Millisecond) // Give time for scheduler to execute topups
+}
+
+func TestTpBalanceCounter(t *testing.T) {
+	if !*testIntegration {
+		return
+	}
+	tStart := time.Date(2016, 3, 31, 0, 0, 0, 0, time.UTC)
+	cd := engine.CallDescriptor{
+		Direction:     "*out",
+		Category:      "call",
+		Tenant:        "cgrates.org",
+		Subject:       "1001",
+		Destination:   "+49",
+		DurationIndex: 0,
+		TimeStart:     tStart,
+		TimeEnd:       tStart.Add(time.Duration(20) * time.Second),
+	}
+	var cc engine.CallCost
+	if err := tpRPC.Call("Responder.Debit", cd, &cc); err != nil {
+		t.Error("Got error on Responder.GetCost: ", err.Error())
+	} else if cc.GetDuration() == 20 {
+		t.Errorf("Calling Responder.MaxDebit got callcost: %v", cc.GetDuration())
+	}
+	var acnt *engine.Account
+	attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001"}
+	if err := tpRPC.Call("ApierV2.GetAccount", attrs, &acnt); err != nil {
+		t.Error("Got error on ApierV2.GetAccount: ", err.Error())
+	} else if acnt.UnitCounters[utils.MONETARY][1].Counters[0].Value != 20.0 {
+		t.Errorf("Calling ApierV2.GetBalance received: %s", utils.ToIJSON(acnt))
+	}
+}