Fix integration tests

test/cli_test.go

@@ -11,9 +11,10 @@ package integration
 import (
 	"os"
 	"os/exec"
-	"path/filepath"
 	"testing"
 	"time"
+
+	"github.com/syncthing/syncthing/internal/osutil"
 )
 
 func TestCLIReset(t *testing.T) {

test/conflict_test.go

@@ -12,9 +12,10 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
-	"path/filepath"
 	"testing"
 	"time"
+
+	"github.com/syncthing/syncthing/internal/osutil"
 )
 
 func TestConflict(t *testing.T) {

test/util.go

@@ -24,6 +24,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/syncthing/syncthing/internal/osutil"
 	"github.com/syncthing/syncthing/internal/symlinks"
 )