diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
new file mode 100644
index 0000000..eac7141
--- /dev/null
+++ b/.github/workflows/dotnet.yml
@@ -0,0 +1,28 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: .NET
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 6.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal --filter FullyQualifiedName!~Workstation.UaClient.IntegrationTests 
diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
deleted file mode 100644
index 4374adb..0000000
--- a/.github/workflows/unittests.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Unit Tests
-
-on: [pull_request, push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    
-    steps:
-    - uses: actions/checkout@v2
-    - name: Setup dotnet 2.2
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '2.2.103'
-    - name: Setup dotnet 3.1
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-    - name: Setup dotnet 6.0
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '6.0.x'
-    - name: Build with dotnet
-      run: dotnet build --configuration Release
-    - name: Run unit tests
-      run: dotnet test --filter "FullyQualifiedName~UnitTests"